Added the functional tests