Fix more test statements in stopselect