More cleanup; fixed a broken test