Write a lot of boundary value tests. And then try to merge into the fork, so I had to revert some merge conflict fixes.