Fix all but delete/update tests