Fixing TCK tests.