Make tests consistent for CRB and DBS
Make tests consistent for CRB and DBS