Merge "Fix test relying on implementation details."