Corrected failing TCK test (based on spec and ri changes)