Even more mac_user tests!
Merge pull request #10659 from rallytime/mac_user_test

Even more mac_user tests!