Rescue from NotAuthorised with a 403
Fix test expectations
Merge branch 'bugfix-fix-user-switching' into staging