Functional tests added