Quicktest Fixes with New API
Merge branch 'api-breaks' into remove-dataset-change