Added additional test cases and added it to the code generator so that
it'll appear on the "Matchers" factory utility which was initially
missing from Kevin Pauli's patch.