Commit prepared in https://github.com/tremes/cdi-tck/tree/CDITCK-479 once the linked issue is fixed.