updated functional tests