More work on the unit tests.