Rebased and recast the new tests as unit tests.