Merge "Revert "Add new test expectations after enso move.""