Fix spec failures related to removing passwords from groups