Use test type names instead of ids