Changes to functional tests