Added MergeSort
Also refactored the test suite