exclude sites up or downstream of the CDS, improved unit tests