Admin invitations test fixes from merge conflict