Merge all ViewModel base classes into one.
Update unit tests.