More test cleaning