Added Functional Test