Updating functional tests