Yep a case for additional unittests me thinks.