Better return values for failing to delete datasets.
Merge branch 'test' into dev