More bi-directional test file changes.