Issue refs #1691: refactoring - clean user model from temporary fields, split user for app and user for api
Issue refs #1691: fix tests