RL-fix functional tests (previous changes reverted accidentally)