Added another test for funzies
Fixed/added tests for the matching functions