Fix for ATS tests