Attempt fix for functional tests.