More match fun + tests