Seems like a great time for some scalacheck's, though not a blocker on this PR