Vinay, D3 | Fix more tests