Remove dup tags. Fix failed tests.

New PR after the old one got reverted for failing tests.