Fixes in functional tests