Added option to lazily specify assured deletion and test cases for it