Add path test

Also add failing test for query matcher
Fix query matching