Clean up and fix tests broken by 8daa4097.

Parrot still suffers from issue #88.