Minor test suite tweaks for launch/poe