cleanup unused class and add more tests to increase test coverage