Hooray for unit tests!

20 of them now!