simplify tests
improve :edit command
fix edit command