a few more router tests
fixed a few more headings
Merge remote-tracking branch 'upstream/master'