Fixup tests for changes to multi-editor functionality