Improved unit test coverage again