adapted subtype tests to the newest generator version