Fix CDI test issues