Added OZ and OZ candidates to test data generation