Added the functional tests after removal