Fixed Functional Tests after merge