[WIP] Unit tests are paying dividends!