Fixes for some of the broken unit tests, caused by missing test data
Merge pull request #1268 from markewallace/UnitTestFixes

Fixes for some of the broken unit tests