diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaClassMetricKey.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaClassMetricKey.java
index 211f2824dc..544af36631 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaClassMetricKey.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaClassMetricKey.java
@@ -6,7 +6,6 @@ package net.sourceforge.pmd.lang.java.metrics.api;
 
 import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
 import net.sourceforge.pmd.lang.java.metrics.impl.AtfdMetric.AtfdClassMetric;
-import net.sourceforge.pmd.lang.java.metrics.impl.CycloMetric.CycloClassMetric;
 import net.sourceforge.pmd.lang.java.metrics.impl.LocMetric.LocClassMetric;
 import net.sourceforge.pmd.lang.java.metrics.impl.NcssMetric.NcssClassMetric;
 import net.sourceforge.pmd.lang.java.metrics.impl.WmcMetric;
@@ -31,13 +30,6 @@ public enum JavaClassMetricKey implements MetricKey<ASTAnyTypeDeclaration> {
      */
     WMC(new WmcMetric()),
 
-    /**
-     * Cyclomatic complexity.
-     *
-     * @see net.sourceforge.pmd.lang.java.metrics.impl.CycloMetric
-     */
-    CYCLO(new CycloClassMetric()),
-
     /**
      * Non Commenting Source Statements.
      *
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaOperationMetricKey.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaOperationMetricKey.java
index a6236e6cd9..152a3bf4d9 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaOperationMetricKey.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/api/JavaOperationMetricKey.java
@@ -6,7 +6,7 @@ package net.sourceforge.pmd.lang.java.metrics.api;
 
 import net.sourceforge.pmd.lang.java.ast.ASTMethodOrConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.metrics.impl.AtfdMetric.AtfdOperationMetric;
-import net.sourceforge.pmd.lang.java.metrics.impl.CycloMetric.CycloOperationMetric;
+import net.sourceforge.pmd.lang.java.metrics.impl.CycloMetric;
 import net.sourceforge.pmd.lang.java.metrics.impl.LocMetric.LocOperationMetric;
 import net.sourceforge.pmd.lang.java.metrics.impl.NcssMetric.NcssOperationMetric;
 import net.sourceforge.pmd.lang.java.metrics.impl.NpathMetric;
@@ -27,9 +27,9 @@ public enum JavaOperationMetricKey implements MetricKey<ASTMethodOrConstructorDe
     /**
      * Cyclomatic complexity.
      *
-     * @see net.sourceforge.pmd.lang.java.metrics.impl.CycloMetric
+     * @see CycloMetric
      */
-    CYCLO(new CycloOperationMetric()),
+    CYCLO(new CycloMetric()),
 
     /**
      * Non Commenting Source Statements.
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/CycloMetric.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/CycloMetric.java
index 63db78c195..fb0d5ae0db 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/CycloMetric.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/CycloMetric.java
@@ -8,18 +8,15 @@ import java.util.List;
 
 import org.apache.commons.lang3.mutable.MutableInt;
 
-import net.sourceforge.pmd.lang.java.ast.ASTAnyTypeDeclaration;
 import net.sourceforge.pmd.lang.java.ast.ASTConditionalAndExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTConditionalOrExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTExpression;
 import net.sourceforge.pmd.lang.java.ast.ASTMethodOrConstructorDeclaration;
 import net.sourceforge.pmd.lang.java.ast.JavaParserVisitor;
-import net.sourceforge.pmd.lang.java.metrics.JavaMetrics;
-import net.sourceforge.pmd.lang.java.metrics.api.JavaOperationMetricKey;
 import net.sourceforge.pmd.lang.java.metrics.impl.visitors.CycloPathUnawareOperationVisitor;
 import net.sourceforge.pmd.lang.java.metrics.impl.visitors.StandardCycloVisitor;
 import net.sourceforge.pmd.lang.metrics.MetricVersion;
-import net.sourceforge.pmd.lang.metrics.ResultOption;
+
 
 /**
  * McCabe's Cyclomatic Complexity. Number of independent paths through a block of code [1, 2]. Formally, given that the
@@ -53,15 +50,24 @@ import net.sourceforge.pmd.lang.metrics.ResultOption;
  * @author Clément Fournier
  * @since June 2017
  */
-public final class CycloMetric {
+public final class CycloMetric extends AbstractJavaOperationMetric {
 
-    private CycloMetric() {
-
-    }
 
     // TODO:cf Cyclo should develop factorized boolean operators to count them
 
 
+    @Override
+    public double computeFor(ASTMethodOrConstructorDeclaration node, MetricVersion version) {
+
+        JavaParserVisitor visitor = (CycloVersion.IGNORE_BOOLEAN_PATHS == version)
+                                    ? new CycloPathUnawareOperationVisitor()
+                                    : new StandardCycloVisitor();
+
+        MutableInt cyclo = (MutableInt) node.jjtAccept(visitor, new MutableInt(1));
+        return (double) cyclo.getValue();
+    }
+
+
     /**
      * Evaluates the number of paths through a boolean expression. This is the total number of {@code &&} and {@code ||}
      * operators appearing in the expression. This is used in the calculation of cyclomatic and n-path complexity.
@@ -98,26 +104,4 @@ public final class CycloMetric {
         IGNORE_BOOLEAN_PATHS
     }
 
-    public static final class CycloOperationMetric extends AbstractJavaOperationMetric {
-
-        @Override
-        public double computeFor(ASTMethodOrConstructorDeclaration node, MetricVersion version) {
-
-            JavaParserVisitor visitor = (CycloVersion.IGNORE_BOOLEAN_PATHS == version)
-                                        ? new CycloPathUnawareOperationVisitor()
-                                        : new StandardCycloVisitor();
-
-            MutableInt cyclo = (MutableInt) node.jjtAccept(visitor, new MutableInt(1));
-            return (double) cyclo.getValue();
-        }
-    }
-
-    public static final class CycloClassMetric extends AbstractJavaClassMetric {
-
-        @Override
-        public double computeFor(ASTAnyTypeDeclaration node, MetricVersion version) {
-            return 1 + JavaMetrics.get(JavaOperationMetricKey.CYCLO, node, version, ResultOption.AVERAGE);
-        }
-    }
-
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/visitors/StandardCycloVisitor.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/visitors/StandardCycloVisitor.java
index 6631aba1a3..b4db65bace 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/visitors/StandardCycloVisitor.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/impl/visitors/StandardCycloVisitor.java
@@ -91,9 +91,8 @@ public class StandardCycloVisitor extends CycloPathUnawareOperationVisitor {
         super.visit(node, data);
 
         if (node.isTernary()) {
-            int boolCompTern = NPathComplexityRule
-                .sumExpressionComplexity(node.getFirstChildOfType(ASTExpression.class));
-            ((MutableInt) data).add(boolCompTern);
+            int boolCompTern = NPathComplexityRule.sumExpressionComplexity(node.getFirstChildOfType(ASTExpression.class));
+            ((MutableInt) data).add(1 + boolCompTern);
         }
         return data;
     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/rule/CyclomaticComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/rule/CyclomaticComplexityRule.java
index 5b00403dde..6a6f34bf2e 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/rule/CyclomaticComplexityRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/metrics/rule/CyclomaticComplexityRule.java
@@ -19,7 +19,6 @@ import net.sourceforge.pmd.lang.java.rule.AbstractJavaMetricsRule;
 import net.sourceforge.pmd.lang.metrics.Metric.Version;
 import net.sourceforge.pmd.lang.metrics.MetricVersion;
 import net.sourceforge.pmd.lang.metrics.ResultOption;
-import net.sourceforge.pmd.lang.rule.properties.BooleanProperty;
 import net.sourceforge.pmd.lang.rule.properties.EnumeratedProperty;
 import net.sourceforge.pmd.lang.rule.properties.IntegerProperty;
 
@@ -30,15 +29,11 @@ import net.sourceforge.pmd.lang.rule.properties.IntegerProperty;
  */
 public class CyclomaticComplexityRule extends AbstractJavaMetricsRule {
 
-    private static final IntegerProperty REPORT_LEVEL_DESCRIPTOR = new IntegerProperty(
-        "reportLevel", "Cyclomatic Complexity reporting threshold", 1, 30, 10, 1.0f);
-
-    private static final BooleanProperty REPORT_CLASSES_DESCRIPTOR = new BooleanProperty(
-        "reportClasses", "Add class average violations to the report", true, 2.0f);
-
-    private static final BooleanProperty REPORT_METHODS_DESCRIPTOR = new BooleanProperty(
-        "reportMethods", "Add method average violations to the report", true, 3.0f);
+    private static final IntegerProperty CLASS_LEVEL_DESCRIPTOR = new IntegerProperty(
+        "classReportLevel", "Total class complexity reporting threshold", 1, 200, 40, 1.0f);
 
+    private static final IntegerProperty METHOD_LEVEL_DESCRIPTOR = new IntegerProperty(
+        "methodReportLevel", "Cyclomatic complexity reporting threshold", 1, 30, 10, 1.0f);
 
     private static final Map<String, MetricVersion> VERSION_MAP;
 
@@ -54,26 +49,23 @@ public class CyclomaticComplexityRule extends AbstractJavaMetricsRule {
         "cycloVersion", "Choose a variant of Cyclo or the standard",
         VERSION_MAP, Version.STANDARD, MetricVersion.class, 3.0f);
 
-    private int reportLevel;
-    private boolean reportClasses = true;
-    private boolean reportMethods = true;
+    private int methodReportLevel;
+    private int classReportLevel;
     private MetricVersion cycloVersion = Version.STANDARD;
 
 
     public CyclomaticComplexityRule() {
-        definePropertyDescriptor(REPORT_LEVEL_DESCRIPTOR);
-        definePropertyDescriptor(REPORT_CLASSES_DESCRIPTOR);
-        definePropertyDescriptor(REPORT_METHODS_DESCRIPTOR);
+        definePropertyDescriptor(CLASS_LEVEL_DESCRIPTOR);
+        definePropertyDescriptor(METHOD_LEVEL_DESCRIPTOR);
         definePropertyDescriptor(CYCLO_VERSION_DESCRIPTOR);
     }
 
 
     @Override
     public Object visit(ASTCompilationUnit node, Object data) {
-        reportLevel = getProperty(REPORT_LEVEL_DESCRIPTOR);
+        methodReportLevel = getProperty(METHOD_LEVEL_DESCRIPTOR);
+        classReportLevel = getProperty(CLASS_LEVEL_DESCRIPTOR);
         cycloVersion = getProperty(CYCLO_VERSION_DESCRIPTOR);
-        reportClasses = getProperty(REPORT_CLASSES_DESCRIPTOR);
-        reportMethods = getProperty(REPORT_METHODS_DESCRIPTOR);
 
         super.visit(node, data);
         return data;
@@ -85,14 +77,16 @@ public class CyclomaticComplexityRule extends AbstractJavaMetricsRule {
 
         super.visit(node, data);
 
-        if (reportClasses && JavaClassMetricKey.CYCLO.supports(node)) {
-            int classCyclo = (int) JavaMetrics.get(JavaClassMetricKey.CYCLO, node, cycloVersion);
-            int classHighest = (int) JavaMetrics.get(JavaOperationMetricKey.CYCLO, node, cycloVersion, ResultOption.HIGHEST);
+        if (JavaClassMetricKey.WMC.supports(node)) {
+            int classWmc = (int) JavaMetrics.get(JavaClassMetricKey.WMC, node, cycloVersion);
+
+            if (classWmc >= classReportLevel) {
+                int classHighest = (int) JavaMetrics.get(JavaOperationMetricKey.CYCLO, node, cycloVersion, ResultOption.HIGHEST);
 
-            if (classCyclo >= reportLevel || classHighest >= reportLevel) {
                 String[] messageParams = {node.getTypeKind().name().toLowerCase(),
                                           node.getImage(),
-                                          classCyclo + " (Highest = " + classHighest + ")", };
+                                          " total",
+                                          classWmc + " (highest " + classHighest + ")", };
 
                 addViolation(data, node, messageParams);
             }
@@ -104,13 +98,14 @@ public class CyclomaticComplexityRule extends AbstractJavaMetricsRule {
     @Override
     public final Object visit(ASTMethodOrConstructorDeclaration node, Object data) {
 
-        if (reportMethods) {
-            int cyclo = (int) JavaMetrics.get(JavaOperationMetricKey.CYCLO, node, cycloVersion);
-            if (cyclo >= reportLevel) {
-                addViolation(data, node, new String[] {node instanceof ASTMethodDeclaration ? "method" : "constructor",
-                                                       node.getQualifiedName().getOperation(), "" + cyclo, });
-            }
+        int cyclo = (int) JavaMetrics.get(JavaOperationMetricKey.CYCLO, node, cycloVersion);
+        if (cyclo >= methodReportLevel) {
+            addViolation(data, node, new String[] {node instanceof ASTMethodDeclaration ? "method" : "constructor",
+                                                   node.getQualifiedName().getOperation(),
+                                                   "",
+                                                   "" + cyclo, });
         }
+
         return data;
     }
 
diff --git a/pmd-java/src/main/resources/rulesets/java/metrics.xml b/pmd-java/src/main/resources/rulesets/java/metrics.xml
index 38e7c9f722..1b6ee14b93 100644
--- a/pmd-java/src/main/resources/rulesets/java/metrics.xml
+++ b/pmd-java/src/main/resources/rulesets/java/metrics.xml
@@ -10,7 +10,7 @@
     </description>
 
     <rule name="CyclomaticComplexity"
-          message="The {0} ''{1}'' has a Cyclomatic Complexity of {2}."
+          message="The {0} ''{1}'' has a{2} cyclomatic complexity of {3}."
           since="1.03"
           class="net.sourceforge.pmd.lang.java.metrics.rule.CyclomaticComplexityRule"
           metrics="true"
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/impl/CycloTestRule.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/impl/CycloTestRule.java
index fa3ece8228..8024c3fc06 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/impl/CycloTestRule.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/metrics/impl/CycloTestRule.java
@@ -20,7 +20,7 @@ public class CycloTestRule extends AbstractMetricTestRule {
 
     @Override
     protected JavaClassMetricKey getClassKey() {
-        return JavaClassMetricKey.CYCLO;
+        return null;
     }
 
 
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/metrics/impl/xml/CycloTest.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/metrics/impl/xml/CycloTest.xml
index e7302c2c1a..689d89ca50 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/metrics/impl/xml/CycloTest.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/metrics/impl/xml/CycloTest.xml
@@ -66,21 +66,19 @@
 
     <test-code>
         <description>Complicated method - Standard</description>
-        <expected-problems>3</expected-problems>
+        <expected-problems>2</expected-problems>
         <expected-messages>
-            <message>'.Complicated' has value 13 highest 21.</message>
             <message>'.Complicated#exception()' has value 4.</message>
-            <message>'.Complicated#example()' has value 21.</message>
+            <message>'.Complicated#example()' has value 23.</message>
         </expected-messages>
         <code-ref id="full-example"/>
     </test-code>
 
     <test-code>
         <description>Complicated method - Ignore boolean path version</description>
-        <expected-problems>3</expected-problems>
+        <expected-problems>2</expected-problems>
         <rule-property name="metricVersion">ignoreBooleanPaths</rule-property>
         <expected-messages>
-            <message>'.Complicated' has value 10 highest 14.</message>
             <message>'.Complicated#exception()' has value 4.</message>
             <message>'.Complicated#example()' has value 14.</message>
         </expected-messages>
@@ -103,21 +101,6 @@
         </code>
     </test-code>
 
-    <test-code>
-        <description>Empty class should count 0</description>
-        <expected-problems>1</expected-problems>
-        <expected-messages>
-            <message>'.Foo' has value 0 highest 0.</message>
-        </expected-messages>
-        <code>
-            <![CDATA[
-            class Foo {
-            }
-            ]]>
-        </code>
-    </test-code>
-
-
     <code-fragment id="constructor-violation">
         <![CDATA[
         public class Test {
@@ -135,8 +118,7 @@
     </code-fragment>
 
     <test-code>
-        <description>#984 Cyclomatic complexity should treat constructors like methods
-        </description>
+        <description>#984 Cyclomatic complexity should treat constructors like methods</description>
         <rule-property name="reportClasses">false</rule-property>
         <expected-problems>1</expected-problems>
         <expected-messages>
@@ -201,27 +183,21 @@
     </test-code>
 
     <test-code>
-        <description>Interfaces are not supported</description>
-        <expected-problems>0</expected-problems>
+        <description>Ternary expression counts 1 + boolean complexity</description>
+        <expected-problems>1</expected-problems>
+        <expected-messages>
+            <message>'.Foo#bar()' has value 3.</message>
+        </expected-messages>
         <code>
             <![CDATA[
-            interface Koo {
-              void bar();
+            class Foo {
+              void bar() {
+                boolean a, b;
+                boolean c = (a || b) ? a : b;
+              }
             }
             ]]>
         </code>
     </test-code>
 
-    <test-code>
-        <description>Avoid division by 0 when averaging a metric over no operations</description>
-        <rule-property name="reportLevel">-1</rule-property>
-        <expected-problems>1</expected-problems>
-        <expected-messages>'.Foo' has value NaN.</expected-messages>
-        <code>
-            <![CDATA[
-            public class Foo { }
-            ]]>
-        </code>
-    </test-code>
-
 </test-data>
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/metrics/xml/CyclomaticComplexity.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/metrics/xml/CyclomaticComplexity.xml
index 98288e5906..2747ddcab4 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/metrics/xml/CyclomaticComplexity.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/metrics/xml/CyclomaticComplexity.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <test-data>
 
-    <code-fragment id="basic-violation">
+    <code-fragment id="full-example">
       <![CDATA[
         public class Complicated {
           public void example() {
@@ -47,11 +47,12 @@
 
     <test-code>
         <description>Simple method</description>
-        <rule-property name="reportLevel">1</rule-property>
+        <rule-property name="classReportLevel">1</rule-property>
+        <rule-property name="methodReportLevel">1</rule-property>
         <expected-problems>2</expected-problems>
         <expected-messages>
-            <message>The class 'Foo' has a Cyclomatic Complexity of 2 (Highest = 1).</message>
-            <message>The method 'foo()' has a Cyclomatic Complexity of 1.</message>
+            <message>The class 'Foo' has a total cyclomatic complexity of 1 (highest 1).</message>
+            <message>The method 'foo()' has a cyclomatic complexity of 1.</message>
         </expected-messages>
         <code>
           <![CDATA[
@@ -64,7 +65,6 @@
 
     <test-code>
         <description>testLessComplicatedThanReportLevel</description>
-        <rule-property name="reportLevel">10</rule-property>
         <expected-problems>0</expected-problems>
         <code>
           <![CDATA[
@@ -77,34 +77,29 @@
 
     <test-code>
         <description>Complicated method</description>
-        <rule-property name="reportLevel">10</rule-property>
-        <expected-problems>2</expected-problems>
+        <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>The class 'Complicated' has a Cyclomatic Complexity of 18 (Highest = 17).</message>
-            <message>The method 'example()' has a Cyclomatic Complexity of 17.</message>
+            <message>The method 'example()' has a cyclomatic complexity of 17.</message>
         </expected-messages>
-        <code-ref id="basic-violation"/>
+        <code-ref id="full-example"/>
     </test-code>
 
     <test-code>
         <description>Complicated method (ignoreBooleanPath)</description>
-        <rule-property name="reportLevel">10</rule-property>
         <rule-property name="cycloVersion">ignoreBooleanPaths</rule-property>
-        <expected-problems>2</expected-problems>
+        <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>The class 'Complicated' has a Cyclomatic Complexity of 11 (Highest = 10).</message>
-            <message>The method 'example()' has a Cyclomatic Complexity of 10.</message>
+            <message>The method 'example()' has a cyclomatic complexity of 10.</message>
         </expected-messages>
-        <code-ref id="basic-violation"/>
+        <code-ref id="full-example"/>
     </test-code>
 
     <test-code>
         <description>Constructor</description>
-        <rule-property name="reportLevel">1</rule-property>
-        <expected-problems>2</expected-problems>
+        <rule-property name="methodReportLevel">1</rule-property>
+        <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>The class 'Foo' has a Cyclomatic Complexity of 2 (Highest = 1).</message>
-            <message>The constructor 'Foo()' has a Cyclomatic Complexity of 1.</message>
+            <message>The constructor 'Foo()' has a cyclomatic complexity of 1.</message>
         </expected-messages>
         <code>
           <![CDATA[
@@ -116,23 +111,19 @@
     </test-code>
 
     <test-code>
-        <description>Testing new parameter showClassMethods</description>
-        <rule-property name="reportClasses">false</rule-property>
+        <description>Test class report level</description>
+        <rule-property name="classReportLevel">17</rule-property>
+        <rule-property name="methodReportLevel">999</rule-property>
         <expected-problems>1</expected-problems>
-        <code-ref id="basic-violation"/>
+        <code-ref id="full-example"/>
     </test-code>
 
     <test-code>
-        <description>Testing new parameter showMethodsMethods</description>
-        <rule-property name="reportMethods">false</rule-property>
+        <description>Test method report level</description>
+        <rule-property name="classReportLevel">999</rule-property>
+        <rule-property name="methodReportLevel">17</rule-property>
         <expected-problems>1</expected-problems>
-        <code-ref id="basic-violation"/>
-    </test-code>
-
-    <test-code>
-        <description>Testing default value of showClassMethods and reportClasses</description>
-        <expected-problems>2</expected-problems>
-        <code-ref id="basic-violation"/>
+        <code-ref id="full-example"/>
     </test-code>
 
     <code-fragment id="constructor-violation">
@@ -152,29 +143,22 @@
     </code-fragment>
 
     <test-code>
-        <description>#984 Cyclomatic complexity should treat constructors like methods: 1 - reportMethods=true
-        </description>
-        <rule-property name="reportClasses">false</rule-property>
-        <rule-property name="reportMethods">true</rule-property>
-        <rule-property name="reportLevel">1</rule-property>
+        <description>#984 Cyclomatic complexity should treat constructors like methods: 1 - reportMethods=true</description>
+        <rule-property name="methodReportLevel">1</rule-property>
         <expected-problems>1</expected-problems>
         <code-ref id="constructor-violation"/>
     </test-code>
 
     <test-code>
-        <description>#984 Cyclomatic complexity should treat constructors like methods: 2 -
-            reportMethods=false
-        </description>
-        <rule-property name="reportClasses">false</rule-property>
-        <rule-property name="reportMethods">false</rule-property>
-        <rule-property name="reportLevel">1</rule-property>
+        <description>#984 Cyclomatic complexity should treat constructors like methods: 2 -reportMethods=false</description>
+        <rule-property name="methodReportLevel">999</rule-property>
         <expected-problems>0</expected-problems>
         <code-ref id="constructor-violation"/>
     </test-code>
 
     <test-code reinitializeRule="true">
         <description>#985 Suppressed methods shouldn't affect avg CyclomaticComplexity</description>
-        <rule-property name="reportLevel">2</rule-property>
+        <rule-property name="methodReportLevel">2</rule-property>
         <expected-problems>0</expected-problems>
         <code>
           <![CDATA[
@@ -211,25 +195,21 @@
 
     <test-code>
         <description>Standard Cyclo should count empty switch labels too</description>
-        <rule-property name="reportClasses">false</rule-property>
-        <rule-property name="reportMethods">true</rule-property>
-        <rule-property name="reportLevel">2</rule-property>
+        <rule-property name="methodReportLevel">2</rule-property>
         <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>The method 'switchCase()' has a Cyclomatic Complexity of 3.</message>
+            <message>The method 'switchCase()' has a cyclomatic complexity of 3.</message>
         </expected-messages>
         <code-ref id="fallthroughSwitch"/>
     </test-code>
 
     <test-code>
         <description>IgnoreBooleanPaths Cyclo should not count empty switch labels</description>
-        <rule-property name="reportClasses">false</rule-property>
-        <rule-property name="reportMethods">true</rule-property>
         <rule-property name="cycloVersion">ignoreBooleanPaths</rule-property>
-        <rule-property name="reportLevel">2</rule-property>
+        <rule-property name="methodReportLevel">2</rule-property>
         <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>The method 'switchCase()' has a Cyclomatic Complexity of 2.</message>
+            <message>The method 'switchCase()' has a cyclomatic complexity of 2.</message>
         </expected-messages>
         <code-ref id="fallthroughSwitch"/>
     </test-code>
@@ -253,37 +233,133 @@
 
     <test-code>
         <description>Standard Cyclo should count boolean paths</description>
-        <rule-property name="reportClasses">false</rule-property>
-        <rule-property name="reportLevel">2</rule-property>
+        <rule-property name="methodReportLevel">2</rule-property>
         <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>The method 'foo()' has a Cyclomatic Complexity of 8.</message>
+            <message>The method 'foo()' has a cyclomatic complexity of 8.</message>
         </expected-messages>
         <code-ref id="manyBooleanOps"/>
     </test-code>
 
     <test-code>
         <description>IgnoreBooleanPaths Cyclo should not count boolean paths</description>
-        <rule-property name="reportClasses">false</rule-property>
         <rule-property name="cycloVersion">ignoreBooleanPaths</rule-property>
-        <rule-property name="reportLevel">2</rule-property>
+        <rule-property name="methodReportLevel">2</rule-property>
         <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>The method 'foo()' has a Cyclomatic Complexity of 4.</message>
+            <message>The method 'foo()' has a cyclomatic complexity of 4.</message>
         </expected-messages>
         <code-ref id="manyBooleanOps"/>
     </test-code>
 
-    <test-code>
-        <description>Avoid division by 0 when averaging a metric over no operations</description>
-        <rule-property name="reportLevel">-1</rule-property>
-        <expected-problems>1</expected-problems>
-        <code>
-          <![CDATA[
-            public class Foo { }
-          ]]>
-        </code>
+    <code-fragment id="many-small-methods">
+        <![CDATA[
+        public class Complicated {
+          int x = 0, y = 1, z = 2, t = 2;
+          boolean a = false, b = true, c = false, d = true;
 
+          public void example1() {
+            if (a && b || b && d) {
+              if (y == z) {
+                x = 2;
+              } else if (y == t && !d) {
+                x = 2;
+              } else {
+                x = 2;
+              }
+            }
+          }
+
+          public void example2() {
+            if (c && d) {
+              while (z < y) {
+                x = 2;
+              }
+            }
+          }
+
+           public void example12() {
+            if (a && b || b && d) {
+              if (y == z) {
+                x = 2;
+              } else if (y == t && !d) {
+                x = 2;
+              } else {
+                x = 2;
+              }
+            }
+          }
+
+          public void example22() {
+            if (c && d) {
+              while (z < y) {
+                x = 2;
+              }
+            }
+          }
+
+          public void example3() {
+            if (a && !b) {
+              for (int n = 0; n < t; n++) {
+                x = 2;
+              }
+            }
+          }
+
+          public void example32() {
+            if (a && !b) {
+              for (int n = 0; n < t; n++) {
+                x = 2;
+              }
+            }
+          }
+
+          public void example4() {
+            switch (x) {
+            case 1:
+              x = 2;
+              break;
+
+            case 2:
+            case 3:
+              x = 2;
+              break;
+
+            default:
+              x = 2;
+              break;
+            }
+          }
+
+           public void example42() {
+            switch (x) {
+            case 1:
+              x = 2;
+              break;
+
+            case 2:
+            case 3:
+              x = 2;
+              break;
+
+            default:
+              x = 2;
+              break;
+            }
+          }
+
+        }
+        ]]>
+    </code-fragment>
+
+    <test-code>
+        <!-- The class should get reported even though none of its methods get reported. -->
+        <description>Test many unreported methods</description>
+        <expected-problems>1</expected-problems>
+        <expected-messages>
+            <message>The class 'Complicated' has a total cyclomatic complexity of 40 (highest 8).</message>
+        </expected-messages>
+        <code-ref id="many-small-methods"/>
     </test-code>
 
 </test-data>