Fixed tests
Fixed userHandler.