unittest adjustments
refs #713
routing test adjustments
refs #713
fixes #713,fixes #714
changelog for #713 and #714
merging c0b393a193203415cbdecaa0c9e438b0b8066dea...917269c9177250dbc61f57c9f68934fbdb166a2e