Renamed files, splitter the test class