Fix more tests in UserViewTest
Fix more tests in UserViewTest
merge from bugfix