Gowri: fixed few failing tests