Added test methods for edit
Fixed conflicts