more modifications, add user test failing for some reason