Convert CleanUpTest to use data providers

These tests are pretty slow, and by only doing one data set
per test it extends the time they're allowed to run

Change-Id: Ia238a607ca94b96d02116ba6e3dc293c1c82a5a9
Merge "Convert CleanUpTest to use data providers"