Merge "Fix cert handling for dynamic routing tests"