Continued work on unit tests