TMP: ongoing work on unit tests