Found a corner-case and fixed up tests.