Updated path matcher and added tests