Converted verb test to use array_map
Added optional route parameters
Merge branch 'router'