Fixing merge conflicts in tests.EOF

Fixing merge conflicts in tests.