Ongoing work on the unit tests.