Added merge-sort + test