Updated unit test coverage