Fix unit test failures
Fix failing transformation test
Merge pull request #474 from ayushchd/unit_testing

Fix unit test failures