Use our new untaint() procedure in other tests
Fix ack-o.t