minor fixes to unit tests