Fix Failing Tests. TODO: Merge these changes with appropriate commits.

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