user tests + database modifications
Merge branch 'modeling-users'