De-listing overhaul; lists tests.