Added tests
Added edit form