Fixed CCI tests