Some more cleanup in the unit tests