renaming + finished number parse, test