Added bubblesort
Added more tests, fixed mergesort