Finally fixed unit test coverage