Merge pull request #800 from jeanouii/cdi-test-fixes

Attempt to bring the build back to green