More work on unit tests. All passing.