Catching some corner cases & new tests.