more tests and test coverage