More cleanup + reintegrated test fix from nicolas after missed fetch