Make editing tests more robust