Add test cleanup