Continued with tests and renaming: