Merge pull request #64 from onkar-dhuri/2.2

Fix failing test cases