Removed some code duplication from the custom matchers
Removed some more code duplication from custom matchers
Added standard rules (with isolation confirmed to be working)