Added Functional Testing