more test coverage

and deleted some not used class