Ok, that took like 3 hours to set up the tests (and fix a bug the test revealed) and about 1 hour to put in the new feature. #hm