#1618 | D3, Hemanth | fix tests