Added testing for extra exception attributes.

Rather than checking the error messages produced by these exceptions,
directly inspects the token and filename attributes of the PEs and TEs.
Includes some expansion to and cleanup of the test suite.