How about some unit tests, finally?