Convert CleanUpTest to use data providers