Adding Functional Tests