Added tests for users, some still failing