fixes in Select functional tests