Test, for--while refactoring, rename