Hasty fixes for FS integration tests

This is an alternative to @joshmoore's `10776-mif-graphs` branch; including #1141 will ease testing.