Fixed all the tests that were breaking after the merge.

Signed-off-by: Tushar Narayan <tusharnarayan@gmail.com>