More unit test code coverage