Make view and viewmodel activation similar. Fix broken tests.