Making more progress on unit tests.