further improve test coverage