Refactor system editor.
Change system editor tests.