Updates in functional tests