Simanta | Updated tests that broke from pervious commit