Fix comment
Simplify user context creation for tests