Vishal, Abhi #723 Added tests