Update test scripts to run properly with newer POE; add test for SF#1840011.