[#2119] need check to get baton integrated to testing