Fixes cleanup in DPMS and added data product cleanup in some tests.