Implemented editing feature and cleaned up tests