More work on collapse testing.