Refactoring tests and creating a long test source folder.