Fix unit-tests now that we validate the users in the logic