Upgrade to latest test.check, fix associated bug