Add more surgical Rspec for CIDR

See PR #2044