small clean up in unit tests