Added merge sort. Improved tests.