325f7a789e
* Delete duplicate models for user * Use new models in some tests * Add auth model conversion back
* Delete duplicate models for user * Use new models in some tests * Add auth model conversion back