More test clean-ups