Extracting matchers into a custom class

By extracting to a custom class I'm hoping to create a better method for
verifying the persistence changes.

This is still looking a bit backwards as there are lots of methods being
written with lots of delegation.