fix test for upstream master