Slight test cleanup