improve for message and test

Change-Id: Ieaf3d98123571113bf26a454eedf9b30ee223d7c
Signed-off-by: li levi <levi.li@sap.com>