Merge "Add new test expectations after enso move."