Fixing test failures

Change-Id: Iaae3224351accb51129680e9b82a90c62c8f65ac
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>