Fix TyphoonTestUtils