Merge "Fix some tests in SelectTestTests"