Fixed for UserUtils
Fixed some test so they use the new test context only.