changes to make demo flow better
fixing expectations validation in user/group