optimize the overall champion calculation
fix tests