Fixed the functional tests
Fixed the functional tests