Added new Functional Tests