Tests duplication cleanup