Fixes for some of the broken unit tests

Fixes for some of the broken unit tests, caused by missing test data