Test cleaning fixes