refactor. moving test class to test directory.