More test clean up