More test clean up.