Miscellaneous changes to test data generation procedure.