Merge "Fix CC table lookup tests"