Branch merge complete --> Trunk test failure

[Sean Schofield]

I merged the branch stuff for shared and core.  Unfortunately the unit
test related to the TCK is still failing.

@ Mario: Can you look at this again?  (I don't think we ever
successfully tested in the trunk.)

Sean