some progress on unit tests