release branch tests fixes