Restructure notices for deleting test data