Add unit tests for everything that it would possibly make sense to be testing...