Clean-up tests more correctly