merge fix up, added InviteUser test back in, fixed typo