Robustify functional tests