More partial work on unit testing.