fixed functional tests