Simplify user creation and lookup and update tests to match.