Adapt query tests to new String Selector definition