Added extra functional test