Merge "Add "cleanup" for created recordsets + NEW delete zone test"