Fixed unit tests, refactored class file names