Fixed some unit testcases and sorted the mock data.
Merge pull request #171 from manojgn/master

Fixed some unit testcases and sorted the mock data.