progress on unit tests...