Adding dataservice mocks & mocked viewmodel tests; improving test helper