Updated user unit tests
Updated user unit tests