Many updates (oa images and test data generation)