Patch for test

This patches improve tests.
These are not necessary soon but would be needed when we bump core to later versions.
```DuplicatesUtil``` is more and more slipping out of its role as a Util class for the duplicates tests.
We should either rename this class, or put this constant in a more general purpose ```TestUtils``` class and start moving general test helpers over to it.