Add a new test case regarding CDE-308. Correct some tests.