Updates tests for routing, now covers 100%
Further improving test coverage
Sligth modification, moved return to the end of method
Reformat according to style rules