good progress on unit tests