WIP: More work on custom matchers

Adding testing for custom matcher messages.