minor fixes in unit tests