Better tape

Force more conformant sources through stricter tests.