Added new view model, added test project