unittest adjustments
refs #637
routing test adjustments
refs #637
fixes #637,fixes #638
changelog for #637 and #638
merging ced0dbf1721ec3946512c35156cf89365b09badc to 81f1c007e7a3d680eddd1092bc44ed59ec6b0448