I'd like to see a unit test for this as well.