Updated some testcases to verify ticket 160