Some more testcases, fixes for CDs.