Vishal, Abhi #723 Fixing test.
Vishal, Abhi #756,753 Fixing views