improved unit test coverage