Continued progress on unit tests