Fixing generated functional tests