Antony's mocks for the new dataset domain
Merged dataset-mock with changes in the main branch