Renaming test-files according to Style Guide