Fixed some unit testcases and sorted the mock data.