A bit of incremental work, and some cleaned up tests.