Added expand route without type default tests
Added expand route without type default tests

Switched so second parameter has a default value. More logical and
checks that x route used when default value for y supplied

grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation