Clean up integer tests in test_struct, and bring them more in line with the trunk tests.