Add tests for User and UserPasswordToken
Fixes for UserPasswordToken