Invite user, test clean up

I'll look into this more, thanks.