add tests with regard to duplication (#3904)

to minimize later diffs, we can watch how the tests change, rather than
simple introducing tons of new tests

depends on #3930

Author: yaacovCR