Fix test_edit_handlers breaking other tests