Merge "Fix expected file for tests."