better editor
fix tests