Merge Santhosh's latest changes to the tests