Update functional tests for late changes made in I8.