Merge "Revert "enabled duplication check for test sim""