Abstract makeUser into the user test helper