Added more tests for ViewModel