Update tests
Restore users views
Updated tests