APOLLO-3179 Updated user test
APOLLO-3179 Updated test coverage