improved test coverage