New edit and watch commands tests, more bugs are gone!