Fix failing tests

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>