add user models and fix tests