Add some basic Matchers and some Error Matchers

This is just a bandaid, but I ran into a few surprises looking at the outdated lists of Matchers and error-oriented Matchers on the unit testing page. This cleans up two of the lists.