Robustify functional tests

right...