fix(test): fix version sort and handle case where release branch is c…

fix(test): fix version sort and handle case where release branch is c… #6513