|#740|+Shibha|Fixing functional test and externalizing messages for upload