Fix failing tests
Continue work on editor