Fixed some unit testcases and sorted the mock data.
Merge pull request #174 from manojgn/feature-dev

Fixed some unit testcases and sorted the mock data.