Fix broken tests for real this time.