Fix the chance of tests being discarded for MR property specs
Ensure ChordEntity name is unique to fix flakey tests