Add one more test and support for removing matrix param from path