Fix more tests for user_test