Make CompositesBuilder filter duplicates + more unit tests