Hi Arne! I am proposing following fix/update:
https://github.com/cdi-spec/cdi-tck/pull/84
Please let me know, if it's ok.