More work on unit testing.