added structure to the unit tests and some more unit tests for the view model.