Fix for CDIValidatorTest.