Added the functional tests back.