Experimenting with unit tests
And the merge
and another merge