More tests for matching with parameters
Fixed on failing tests