changes from 2 meetings (test setup, MVVM)