more progress on unit tests...