Improve faking of logged-in-user
Merge pull request #149 from muffinresearch/fix-flakey-test

Improve faking of logged-in-user