Update d3

Tests modified and hackhack removed in accordance