Minor changes to tests

Signed-off-by: Mahadevan Sreenivasan <mahadevan_sv@yahoo.com>