Fixed the functional tests