Change tests and add D3