Fixed ViewModelBaseTests