Refactor/update ccei fixture