Add edit handler and tests
Rename event template