Added tests from UserTests