This breaks the delete are you sure? tests.  Checking in for Steve to look at it.
Tests all pass now
Merge branch 'fix-delete-tests' into dev
Merge remote-tracking branch 'origin/dev' into dev