tidy cdl inclusion in test_cdl.
Begin proper cdl group tests.