Added merge_sort(), added smarter tests.