More test clean ups