small changes to functional_tests