Fix Functional Tests