Further unit test coverage