cdi expected tests fixes