First unit test finished
merge-stuff