Fix for failing CDI test