Skip delete tool for new records
Fix test
Fix test for new toolbox layout