Functional tests tweaks, but probably soon to be changed more

AFDP-154