Support existing test types with ASTF