new user model and tests (with tokens)
rework models
working on models