Robustify functional tests

Probably.