Now with cleanup.  Still with 0 tests.