FIX: spt tests are more robust