Updated Functional Tests