Test cases for the new matching logic :)