More work on unit tests