Fix up scoping in a few tests (and delete one that validates unnecessary behavior).