APOLLO-2824 Updated unit tests
APOLLO-2823 Updated unit tests