Add Functional Test