Update Functional Tests