minor fixes for the unit tests