Further test cleanup