Merge pull request #1357 from jamezp/tck-test-fixes

TCK Test Fixes