I might have messed this up with the merge? Other tests still failing.
Handle the edge cases better. I think this fixes the earlier failures.