test-types.cc patch