Experimental fix for test panel crash on test delete