Moved ViewModels to UI project & updated unit tests