Merge "Enhancement of routing test"