Unit test cleanup