Further optimise instance test data generation