Upgrade to TCK SNAPSHOT + minor change in test