Improve UserContextSpec