Use new API
Cosmetics, specialize test and enforce TRANSPORT