More Unit Test Coverage