Added unit tests for checking queries and commands have correct number of viewmodels