* Clean up tests so that they run together as well as separately