Refactor editing-tests. Fix small regression.