Fix for CDIValidatorTest.

If test fails during execution it could happen that cdi validator was not enabled afterwards. To cover this situation, cdi validator is now enabled once test has finished.