Make user tests pass