CD Test Case, some fixes