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
Merge pull request #1267 from LorenzoBoccaccia/fix-all-the-tests

Fixed 4 test failures
disabled failure test with firefox