Renaming class files
Attempting to fix basic unit tests.