Cleanup use of read_structure in unittests.