MODE-1920: Fix TCK tests