Merge "Fix test_select"