Refactored tests for editor