Tests failing for user
Merge branch 'modeling-users'
Fixing errors