[master] + fix a test bug
[master] + revert the change
[2.3.x] + minor test modification