Progress on unit tests