Small test cleanup