CID and CEPA calculations with linear r12 terms