Add more CDA and CDF test cases. Update the logout test case.