Add test
Enable to handle more flexible URL pattern