Unit Tests for ViewService & ViewModelHelpers.
Code tidyup.