MVVM tweaks and tests