efficiency improvements in ComplianceTests