Refactored and corrected bugs in merge sort. Rewrote tests to use GoConvey