Improve quality and readability of some routing tests