fix user handlers and tests