Done some unit testing
Those darn conflicts...