Small fixes for testruns

The test suite hadnt caught up so these changes update it.