improving CDI tests