Adding fixes by ChamilaA for fixing unit tests
Merge pull request #13 from ruwany/master

Adding fixes by ChamilaA for fixing unit tests