Continuing work on unit tests