Add more tests + fix default path for match_querystring case

Also splitted test_simple() into smaller tests