Stop two test state leaks that fail unrelated v16 tests

Two tests that leaked state into later shards are now fixed.