Functional tests fix