Fixes after second review and Editor Command Handlers tests