Fix failing tests. Modify the expected beahvior of testcases.

Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>