cleanup of some unit tests