Finish test code migration to uint