Progress. Down to 3 failures in MaterializationTest.