renamed unit test files and did some refactoring