APOLLO-3179 Unit test coverage