Changes to Functional tests