Vishal #618 fixing tests