further refinement of duplicate checks and more fixes via test regressions