Several bug fixes in CCI port (still broken).
Fixed test name in log messages.