Fix failing unit tests
Merge pull request #1106 from markewallace/FixViewUnitTests

View Unit Tests