Added the rest of the functional tests