Fixed error messages for saity and functional tests

Change-Id: I83eb5da8026ca5ee8a95bc7cb22ebb564e1f0062
Merge "Fixed error messages for saity and functional tests"