compliance test fixes