Unit test clean up