CDI SEAM3 test fixes