Fixing test failures
Merge pull request #11 from erandasooriyabandara/master

Fixing test failures