Fix a bug introduce by the last cts PR
Merge pull request #437 from ebocher/gdms_ctsfix

Update due to upstream CTS changes

Fixes a bug introduced by the last cts PR