Updated slave editor, fixed unit test