Speed improvement test collection

[]
Switch to USD ?