TEST: more work on unit tests