Test fixes
Merge pull request #10645 from rallytime/mac_user_test

Test fixes