Method and unit test cleanup