Convert more of the test21.* tests to use hashes instead of direct
variables.