Renaming file, starting seperating files, fix test name