[TASK] Further work on functional tests