Fix for updating edit/remove so tests work