+ cidr & tests