Fix tests.
Merge topic 'file-generate-if-different' into next

892519ac Fix tests.