Fixed conflicts in TestViewPageActivity, and tweaked other tests as well.