CCHIT testing fixes