trunk-tracking: update tests off 1.5.27.1 r2845