functional tests updated