MDL-47494 gapselect: Fix unit tests for 3.0 compatibility.