merge-sort: added tests, makefile for tests & fixed some mistakes.