Functional tests updated