bring back accidentally clobbered value-contract tests