Improve assertions

I couldn't help but improve my custom matcher structure to match yours, and give the methods some more descriptive names.