diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
index 77d211e1bf..a6047c3853 100644
--- a/lib/src/html/template_data.dart
+++ b/lib/src/html/template_data.dart
@@ -36,7 +36,13 @@ abstract class TemplateData<T extends Documentable> {
   String get kind => self is ModelElement ? (self as ModelElement).kind : null;
 
   List get navLinks;
-  Documentable get parent => navLinks.isNotEmpty ? navLinks.last : null;
+  List get navLinksWithGenerics => [];
+  Documentable get parent {
+    if (navLinksWithGenerics.isEmpty) {
+      return navLinks.isNotEmpty ? navLinks.last : null;
+    }
+    return navLinksWithGenerics.last;
+  }
 
   bool get includeVersion => false;
 
@@ -236,7 +242,9 @@ class ConstructorTemplateData extends TemplateData<Constructor> {
   String get layoutTitle => _layoutTitle(
       constructor.name, constructor.fullKind, constructor.isDeprecated);
   @override
-  List get navLinks => [package, library, clazz];
+  List get navLinks => [package, library];
+  @override
+  List get navLinksWithGenerics => [clazz];
   @override
   Iterable<Subnav> getSubNavItems() => _gatherSubnavForInvokable(constructor);
   @override
@@ -331,7 +339,9 @@ class MethodTemplateData extends TemplateData<Method> {
       'API docs for the ${method.name} method from the ${clazz.name} class, '
       'for the Dart programming language.';
   @override
-  List get navLinks => [package, library, clazz];
+  List get navLinks => [package, library];
+  @override
+  List get navLinksWithGenerics => [clazz];
   @override
   Iterable<Subnav> getSubNavItems() => _gatherSubnavForInvokable(method);
   @override
@@ -361,7 +371,9 @@ class PropertyTemplateData extends TemplateData<Field> {
       'API docs for the ${property.name} $type from the ${clazz.name} class, '
       'for the Dart programming language.';
   @override
-  List get navLinks => [package, library, clazz];
+  List get navLinks => [package, library];
+  @override
+  List get navLinksWithGenerics => [clazz];
   @override
   String get htmlBase => '../..';
 
diff --git a/lib/src/model.dart b/lib/src/model.dart
index b1cb37511d..31720e458d 100644
--- a/lib/src/model.dart
+++ b/lib/src/model.dart
@@ -1126,11 +1126,15 @@ class Class extends ModelElement
 }
 
 class Constructor extends ModelElement
-    with SourceCodeMixin
+    with SourceCodeMixin, TypeParameters
     implements EnclosedElement {
   Constructor(ConstructorElement element, Library library)
       : super(element, library, null);
 
+  @override
+  // TODO(jcollins-g): Revisit this when dart-lang/sdk#31517 is implemented.
+  List<TypeParameter> get typeParameters => (enclosingElement as Class).typeParameters;
+
   @override
   ModelElement get enclosingElement =>
       new ModelElement.from(_constructor.enclosingElement, library);
@@ -1172,6 +1176,20 @@ class Constructor extends ModelElement
     return _name;
   }
 
+  String _nameWithGenerics;
+  @override
+  String get nameWithGenerics {
+    if (_nameWithGenerics == null) {
+      String constructorName = element.name;
+      if (constructorName.isEmpty) {
+        _nameWithGenerics = '${enclosingElement.name}${genericParameters}';
+      } else {
+        _nameWithGenerics = '${enclosingElement.name}${genericParameters}.$constructorName';
+      }
+    }
+    return _nameWithGenerics;
+  }
+
   String get shortName {
     if (name.contains('.')) {
       return name.substring(_constructor.enclosingElement.name.length + 1);
@@ -4689,8 +4707,6 @@ abstract class SourceCodeMixin {
 }
 
 abstract class TypeParameters implements Nameable {
-  Element get element;
-
   String get nameWithGenerics => '$name$genericParameters';
 
   String get genericParameters {
diff --git a/lib/templates/_head.html b/lib/templates/_head.html
index 97a3280ced..9f7496c7b8 100644
--- a/lib/templates/_head.html
+++ b/lib/templates/_head.html
@@ -37,6 +37,9 @@
     {{#navLinks}}
     <li><a href="{{href}}">{{name}}</a></li>
     {{/navLinks}}
+    {{#navLinksWithGenerics}}
+    <li><a href="{{href}}">{{name}}{{{genericParameters}}}</a></li>
+    {{/navLinksWithGenerics}}
     {{^hasHomepage}}
     <li class="self-crumb">{{{ layoutTitle }}}</li>
     {{/hasHomepage}}
diff --git a/lib/templates/constructor.html b/lib/templates/constructor.html
index 7bc02d3c6b..43a3bce48d 100644
--- a/lib/templates/constructor.html
+++ b/lib/templates/constructor.html
@@ -8,8 +8,17 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     {{#constructor}}
     <section class="multi-line-signature">
+      {{#hasAnnotations}}
+      <div>
+        <ol class="annotation-list">
+          {{#annotations}}
+          <li>{{{.}}}</li>
+          {{/annotations}}
+        </ol>
+      </div>
+      {{/hasAnnotations}}
       {{#isConst}}const{{/isConst}}
-      {{>name_summary}}(<wbr>{{#hasParameters}}{{{linkedParamsLines}}}{{/hasParameters}})
+      <span class="name {{#isDeprecated}}deprecated{{/isDeprecated}}">{{{nameWithGenerics}}}</span>(<wbr>{{#hasParameters}}{{{linkedParamsLines}}}{{/hasParameters}})
     </section>
 
     {{>documentation}}
diff --git a/test/model_test.dart b/test/model_test.dart
index 469ae7966e..13fb1cef45 100644
--- a/test/model_test.dart
+++ b/test/model_test.dart
@@ -1915,15 +1915,26 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
   group('Constructor', () {
     Constructor appleDefaultConstructor, constCatConstructor;
     Constructor appleConstructorFromString;
-    Class apple, constCat;
+    Constructor constructorTesterDefault, constructorTesterFromSomething;
+    Class apple, constCat, constructorTester;
     setUp(() {
       apple = exLibrary.classes.firstWhere((c) => c.name == 'Apple');
       constCat = exLibrary.classes.firstWhere((c) => c.name == 'ConstantCat');
+      constructorTester = fakeLibrary.classes.firstWhere((c) => c.name == 'ConstructorTester');
       constCatConstructor = constCat.constructors[0];
       appleDefaultConstructor =
           apple.constructors.firstWhere((c) => c.name == 'Apple');
       appleConstructorFromString =
           apple.constructors.firstWhere((c) => c.name == 'Apple.fromString');
+      constructorTesterDefault =
+          constructorTester.constructors.firstWhere((c) => c.name == 'ConstructorTester');
+      constructorTesterFromSomething =
+          constructorTester.constructors.firstWhere((c) => c.name == 'ConstructorTester.fromSomething');
+    });
+
+    test('displays generic parameters correctly', () {
+      expect(constructorTesterDefault.nameWithGenerics, 'ConstructorTester&lt;A, B&gt;');
+      expect(constructorTesterFromSomething.nameWithGenerics, 'ConstructorTester&lt;A, B&gt;.fromSomething');
     });
 
     test('has a fully qualified name', () {
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
index 521307c1fc..1375f0e600 100644
--- a/testing/test_package/lib/fake.dart
+++ b/testing/test_package/lib/fake.dart
@@ -74,6 +74,11 @@ abstract class BaseThingy2 implements BaseThingy {
   ImplementingThingy2 get aImplementingThingy;
 }
 
+class ConstructorTester<A, B> {
+  ConstructorTester(String param1) {}
+  ConstructorTester.fromSomething(A foo) {}
+}
+
 class HasGenerics<X, Y, Z> {
   HasGenerics(X x, Y y, Z z) {}
 
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html b/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
index 2a9fb492ae..7409469278 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/AnotherParameterizedClass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass&lt;B&gt;</a></li>
     <li class="self-crumb">constructor AnotherParameterizedClass</li>
   </ol>
   <div class="self-name">AnotherParameterizedClass</div>
@@ -63,7 +63,7 @@ <h5>class AnotherParameterizedClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">AnotherParameterizedClass</span>(<wbr>)
+      <span class="name ">AnotherParameterizedClass&lt;B&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html b/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
index 912d192c51..fada71fe23 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass&lt;B&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html b/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
index 33982ab006..92e7671b05 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass&lt;B&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html b/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
index 3bec50230d..092ac6dc8b 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass&lt;B&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html b/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
index fbfb5d0fda..4357ebf61d 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass&lt;B&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html b/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
index e927b716de..fabac39de6 100644
--- a/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
+++ b/testing/test_package_docs/ex/AnotherParameterizedClass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a></li>
+    <li><a href="ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass&lt;B&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/Apple/Apple.fromString.html b/testing/test_package_docs/ex/Apple/Apple.fromString.html
index 76f55e8e70..969dc4741f 100644
--- a/testing/test_package_docs/ex/Apple/Apple.fromString.html
+++ b/testing/test_package_docs/ex/Apple/Apple.fromString.html
@@ -78,7 +78,7 @@ <h5>class Apple</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Apple.fromString</span>(<wbr><span class="parameter" id="fromString-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span></span>)
+      <span class="name ">Apple.fromString</span>(<wbr><span class="parameter" id="fromString-param-s"><span class="type-annotation">String</span> <span class="parameter-name">s</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/Apple/Apple.html b/testing/test_package_docs/ex/Apple/Apple.html
index 9de9bb82ec..6963f4e016 100644
--- a/testing/test_package_docs/ex/Apple/Apple.html
+++ b/testing/test_package_docs/ex/Apple/Apple.html
@@ -78,7 +78,7 @@ <h5>class Apple</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Apple</span>(<wbr>)
+      <span class="name ">Apple</span>(<wbr>)
     </section>
 
     <section class="desc markdown">
diff --git a/testing/test_package_docs/ex/B/B.html b/testing/test_package_docs/ex/B/B.html
index 67b06a04e3..766882bbdd 100644
--- a/testing/test_package_docs/ex/B/B.html
+++ b/testing/test_package_docs/ex/B/B.html
@@ -79,7 +79,7 @@ <h5>class B</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">B</span>(<wbr>)
+      <span class="name ">B</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/Cat/Cat.html b/testing/test_package_docs/ex/Cat/Cat.html
index 11505b68c7..88d3eb5c01 100644
--- a/testing/test_package_docs/ex/Cat/Cat.html
+++ b/testing/test_package_docs/ex/Cat/Cat.html
@@ -65,7 +65,7 @@ <h5>class Cat</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Cat</span>(<wbr>)
+      <span class="name ">Cat</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/CatString/CatString.html b/testing/test_package_docs/ex/CatString/CatString.html
index e9efc5bed4..124dea679f 100644
--- a/testing/test_package_docs/ex/CatString/CatString.html
+++ b/testing/test_package_docs/ex/CatString/CatString.html
@@ -71,7 +71,7 @@ <h5>class CatString</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">CatString</span>(<wbr>)
+      <span class="name ">CatString</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/ConstantCat/ConstantCat.html b/testing/test_package_docs/ex/ConstantCat/ConstantCat.html
index 872b0240b5..0821413d5e 100644
--- a/testing/test_package_docs/ex/ConstantCat/ConstantCat.html
+++ b/testing/test_package_docs/ex/ConstantCat/ConstantCat.html
@@ -66,7 +66,7 @@ <h5>class ConstantCat</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">ConstantCat</span>(<wbr><span class="parameter" id="-param-name"><span class="type-annotation">String</span> <span class="parameter-name">name</span></span>)
+      <span class="name ">ConstantCat</span>(<wbr><span class="parameter" id="-param-name"><span class="type-annotation">String</span> <span class="parameter-name">name</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/Deprecated/Deprecated.html b/testing/test_package_docs/ex/Deprecated/Deprecated.html
index 9ddfc484ec..680c6cf9c9 100644
--- a/testing/test_package_docs/ex/Deprecated/Deprecated.html
+++ b/testing/test_package_docs/ex/Deprecated/Deprecated.html
@@ -64,7 +64,7 @@ <h5>class Deprecated</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">Deprecated</span>(<wbr><span class="parameter" id="-param-expires"><span class="type-annotation">String</span> <span class="parameter-name">expires</span></span>)
+      <span class="name ">Deprecated</span>(<wbr><span class="parameter" id="-param-expires"><span class="type-annotation">String</span> <span class="parameter-name">expires</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/Dog/Dog.deprecatedCreate.html b/testing/test_package_docs/ex/Dog/Dog.deprecatedCreate.html
index 04e93eeef1..5c7afaa125 100644
--- a/testing/test_package_docs/ex/Dog/Dog.deprecatedCreate.html
+++ b/testing/test_package_docs/ex/Dog/Dog.deprecatedCreate.html
@@ -88,8 +88,13 @@ <h5>class Dog</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
+      <div>
+        <ol class="annotation-list">
+          <li>@deprecated</li>
+        </ol>
+      </div>
       
-            <span class="name deprecated">Dog.deprecatedCreate</span>(<wbr><span class="parameter" id="deprecatedCreate-param-name"><span class="type-annotation">String</span> <span class="parameter-name">name</span></span>)
+      <span class="name deprecated">Dog.deprecatedCreate</span>(<wbr><span class="parameter" id="deprecatedCreate-param-name"><span class="type-annotation">String</span> <span class="parameter-name">name</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/Dog/Dog.html b/testing/test_package_docs/ex/Dog/Dog.html
index 01cedd2034..f500737377 100644
--- a/testing/test_package_docs/ex/Dog/Dog.html
+++ b/testing/test_package_docs/ex/Dog/Dog.html
@@ -89,7 +89,7 @@ <h5>class Dog</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Dog</span>(<wbr>)
+      <span class="name ">Dog</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/E/E.html b/testing/test_package_docs/ex/E/E.html
index f71e0c8637..1f63a9d759 100644
--- a/testing/test_package_docs/ex/E/E.html
+++ b/testing/test_package_docs/ex/E/E.html
@@ -63,7 +63,7 @@ <h5>class E</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">E</span>(<wbr>)
+      <span class="name ">E</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/ExtendedShortName/ExtendedShortName.html b/testing/test_package_docs/ex/ExtendedShortName/ExtendedShortName.html
index 9c2f395e0e..746d1bf0db 100644
--- a/testing/test_package_docs/ex/ExtendedShortName/ExtendedShortName.html
+++ b/testing/test_package_docs/ex/ExtendedShortName/ExtendedShortName.html
@@ -64,7 +64,7 @@ <h5>class ExtendedShortName</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">ExtendedShortName</span>(<wbr><span class="parameter" id="-param-aParameter"><span class="type-annotation">String</span> <span class="parameter-name">aParameter</span></span>)
+      <span class="name ">ExtendedShortName</span>(<wbr><span class="parameter" id="-param-aParameter"><span class="type-annotation">String</span> <span class="parameter-name">aParameter</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/F/F.html b/testing/test_package_docs/ex/F/F.html
index cb0bcbc919..76a4e59451 100644
--- a/testing/test_package_docs/ex/F/F.html
+++ b/testing/test_package_docs/ex/F/F.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/F-class.html">F</a></li>
+    <li><a href="ex/F-class.html">F&lt;T extends String&gt;</a></li>
     <li class="self-crumb">constructor F</li>
   </ol>
   <div class="self-name">F</div>
@@ -82,7 +82,7 @@ <h5>class F</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">F</span>(<wbr>)
+      <span class="name ">F&lt;T extends String&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/F/methodWithGenericParam.html b/testing/test_package_docs/ex/F/methodWithGenericParam.html
index 9272573b68..abbea8037a 100644
--- a/testing/test_package_docs/ex/F/methodWithGenericParam.html
+++ b/testing/test_package_docs/ex/F/methodWithGenericParam.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/F-class.html">F</a></li>
+    <li><a href="ex/F-class.html">F&lt;T extends String&gt;</a></li>
     <li class="self-crumb">method methodWithGenericParam</li>
   </ol>
   <div class="self-name">methodWithGenericParam</div>
diff --git a/testing/test_package_docs/ex/F/test.html b/testing/test_package_docs/ex/F/test.html
index 55a7082247..c27bc877d5 100644
--- a/testing/test_package_docs/ex/F/test.html
+++ b/testing/test_package_docs/ex/F/test.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/F-class.html">F</a></li>
+    <li><a href="ex/F-class.html">F&lt;T extends String&gt;</a></li>
     <li class="self-crumb">method test</li>
   </ol>
   <div class="self-name">test</div>
diff --git a/testing/test_package_docs/ex/ForAnnotation/ForAnnotation.html b/testing/test_package_docs/ex/ForAnnotation/ForAnnotation.html
index 5215faeee6..b3120a1e1c 100644
--- a/testing/test_package_docs/ex/ForAnnotation/ForAnnotation.html
+++ b/testing/test_package_docs/ex/ForAnnotation/ForAnnotation.html
@@ -64,7 +64,7 @@ <h5>class ForAnnotation</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">ForAnnotation</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
+      <span class="name ">ForAnnotation</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/HasAnnotation/HasAnnotation.html b/testing/test_package_docs/ex/HasAnnotation/HasAnnotation.html
index e2c49dec9d..5d10fa8f6d 100644
--- a/testing/test_package_docs/ex/HasAnnotation/HasAnnotation.html
+++ b/testing/test_package_docs/ex/HasAnnotation/HasAnnotation.html
@@ -63,7 +63,7 @@ <h5>class HasAnnotation</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">HasAnnotation</span>(<wbr>)
+      <span class="name ">HasAnnotation</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/Helper/Helper.html b/testing/test_package_docs/ex/Helper/Helper.html
index f295d97834..6afed81458 100644
--- a/testing/test_package_docs/ex/Helper/Helper.html
+++ b/testing/test_package_docs/ex/Helper/Helper.html
@@ -64,7 +64,7 @@ <h5>class Helper</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Helper</span>(<wbr>)
+      <span class="name ">Helper</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/Klass/Klass.html b/testing/test_package_docs/ex/Klass/Klass.html
index 5526214153..145310796a 100644
--- a/testing/test_package_docs/ex/Klass/Klass.html
+++ b/testing/test_package_docs/ex/Klass/Klass.html
@@ -68,7 +68,7 @@ <h5>class Klass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Klass</span>(<wbr>)
+      <span class="name ">Klass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/MyError/MyError.html b/testing/test_package_docs/ex/MyError/MyError.html
index c7a2ad04e7..4e836374bd 100644
--- a/testing/test_package_docs/ex/MyError/MyError.html
+++ b/testing/test_package_docs/ex/MyError/MyError.html
@@ -64,7 +64,7 @@ <h5>class MyError</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">MyError</span>(<wbr>)
+      <span class="name ">MyError</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/MyErrorImplements/MyErrorImplements.html b/testing/test_package_docs/ex/MyErrorImplements/MyErrorImplements.html
index 97ee25b76e..91d7d42da3 100644
--- a/testing/test_package_docs/ex/MyErrorImplements/MyErrorImplements.html
+++ b/testing/test_package_docs/ex/MyErrorImplements/MyErrorImplements.html
@@ -64,7 +64,7 @@ <h5>class MyErrorImplements</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">MyErrorImplements</span>(<wbr>)
+      <span class="name ">MyErrorImplements</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/MyException/MyException.html b/testing/test_package_docs/ex/MyException/MyException.html
index 74ed0b531a..b33ee4f07c 100644
--- a/testing/test_package_docs/ex/MyException/MyException.html
+++ b/testing/test_package_docs/ex/MyException/MyException.html
@@ -63,7 +63,7 @@ <h5>class MyException</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">MyException</span>(<wbr>)
+      <span class="name ">MyException</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/MyExceptionImplements/MyExceptionImplements.html b/testing/test_package_docs/ex/MyExceptionImplements/MyExceptionImplements.html
index cd07b9a9f8..e5ac46a80e 100644
--- a/testing/test_package_docs/ex/MyExceptionImplements/MyExceptionImplements.html
+++ b/testing/test_package_docs/ex/MyExceptionImplements/MyExceptionImplements.html
@@ -63,7 +63,7 @@ <h5>class MyExceptionImplements</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">MyExceptionImplements</span>(<wbr>)
+      <span class="name ">MyExceptionImplements</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html b/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
index f0ef438f25..1ee62f1c8b 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/ParameterizedClass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">constructor ParameterizedClass</li>
   </ol>
   <div class="self-name">ParameterizedClass</div>
@@ -69,7 +69,7 @@ <h5>class ParameterizedClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">ParameterizedClass</span>(<wbr>)
+      <span class="name ">ParameterizedClass&lt;T&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
index 206a9cf71b..7185d3a1a6 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedField.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">property aInheritedField</li>
   </ol>
   <div class="self-name">aInheritedField</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
index 3eab5c42e7..8fbe0925ec 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedGetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">property aInheritedGetter</li>
   </ol>
   <div class="self-name">aInheritedGetter</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
index dee5d14fde..41a37ae950 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">abstract method aInheritedMethod</li>
   </ol>
   <div class="self-name">aInheritedMethod</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
index abfd5904ed..51d1400648 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedSetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">property aInheritedSetter</li>
   </ol>
   <div class="self-name">aInheritedSetter</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html b/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
index b5dc1f69c2..05db9d17c9 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/aInheritedTypedefReturningMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">abstract method aInheritedTypedefReturningMethod</li>
   </ol>
   <div class="self-name">aInheritedTypedefReturningMethod</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/hashCode.html b/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
index da2bc33bc6..a1c3a5265c 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html b/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
index 5bc052c06b..71e755d551 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html b/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
index 0f05398d0d..0095a22376 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html b/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
index a1669d7d06..8978fda8b1 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/operator_plus.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">abstract method operator +</li>
   </ol>
   <div class="self-name">operator +</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html b/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
index 856d46a2c9..d9b84f5cd2 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/ex/ParameterizedClass/toString.html b/testing/test_package_docs/ex/ParameterizedClass/toString.html
index 201f6708e9..b9b6342bd9 100644
--- a/testing/test_package_docs/ex/ParameterizedClass/toString.html
+++ b/testing/test_package_docs/ex/ParameterizedClass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass</a></li>
+    <li><a href="ex/ParameterizedClass-class.html">ParameterizedClass&lt;T&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html
index a923bc9853..b5577a836f 100644
--- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html
+++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass/PublicClassExtendsPrivateClass.html
@@ -64,7 +64,7 @@ <h5>class PublicClassExtendsPrivateClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">PublicClassExtendsPrivateClass</span>(<wbr>)
+      <span class="name ">PublicClassExtendsPrivateClass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html
index 97315dcd42..769aa089bf 100644
--- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html
+++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface/PublicClassImplementsPrivateInterface.html
@@ -64,7 +64,7 @@ <h5>class PublicClassImplementsPrivateInterface</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">PublicClassImplementsPrivateInterface</span>(<wbr>)
+      <span class="name ">PublicClassImplementsPrivateInterface</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/ShortName/ShortName.html b/testing/test_package_docs/ex/ShortName/ShortName.html
index e3b9a03f51..3b1fcb70b2 100644
--- a/testing/test_package_docs/ex/ShortName/ShortName.html
+++ b/testing/test_package_docs/ex/ShortName/ShortName.html
@@ -64,7 +64,7 @@ <h5>class ShortName</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">ShortName</span>(<wbr><span class="parameter" id="-param-aParameter"><span class="type-annotation">String</span> <span class="parameter-name">aParameter</span></span>)
+      <span class="name ">ShortName</span>(<wbr><span class="parameter" id="-param-aParameter"><span class="type-annotation">String</span> <span class="parameter-name">aParameter</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/SpecializedDuration/SpecializedDuration.html b/testing/test_package_docs/ex/SpecializedDuration/SpecializedDuration.html
index b4c9cb9a93..31cf5900cf 100644
--- a/testing/test_package_docs/ex/SpecializedDuration/SpecializedDuration.html
+++ b/testing/test_package_docs/ex/SpecializedDuration/SpecializedDuration.html
@@ -81,7 +81,7 @@ <h5>class SpecializedDuration</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">SpecializedDuration</span>(<wbr>)
+      <span class="name ">SpecializedDuration</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html b/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
index 4d503ce817..01980384d5 100644
--- a/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
+++ b/testing/test_package_docs/ex/TemplatedClass/TemplatedClass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass&lt;X&gt;</a></li>
     <li class="self-crumb">constructor TemplatedClass</li>
   </ol>
   <div class="self-name">TemplatedClass</div>
@@ -64,7 +64,7 @@ <h5>class TemplatedClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">TemplatedClass</span>(<wbr>)
+      <span class="name ">TemplatedClass&lt;X&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/TemplatedClass/aMethod.html b/testing/test_package_docs/ex/TemplatedClass/aMethod.html
index 90efe36a40..75c13db711 100644
--- a/testing/test_package_docs/ex/TemplatedClass/aMethod.html
+++ b/testing/test_package_docs/ex/TemplatedClass/aMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass&lt;X&gt;</a></li>
     <li class="self-crumb">method aMethod</li>
   </ol>
   <div class="self-name">aMethod</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/hashCode.html b/testing/test_package_docs/ex/TemplatedClass/hashCode.html
index 4f8fa3dcd4..f4d63769a5 100644
--- a/testing/test_package_docs/ex/TemplatedClass/hashCode.html
+++ b/testing/test_package_docs/ex/TemplatedClass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass&lt;X&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html b/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
index be39971bbb..24c54121ff 100644
--- a/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
+++ b/testing/test_package_docs/ex/TemplatedClass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass&lt;X&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/operator_equals.html b/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
index 6ee771c04e..71962e1975 100644
--- a/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
+++ b/testing/test_package_docs/ex/TemplatedClass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass&lt;X&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/runtimeType.html b/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
index a3d4c9f12b..263da3905c 100644
--- a/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
+++ b/testing/test_package_docs/ex/TemplatedClass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass&lt;X&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/ex/TemplatedClass/toString.html b/testing/test_package_docs/ex/TemplatedClass/toString.html
index bc70665bd4..b7dfb3ba18 100644
--- a/testing/test_package_docs/ex/TemplatedClass/toString.html
+++ b/testing/test_package_docs/ex/TemplatedClass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedClass-class.html">TemplatedClass</a></li>
+    <li><a href="ex/TemplatedClass-class.html">TemplatedClass&lt;X&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html b/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
index 7c4f1dfc14..96929013fa 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/TemplatedInterface.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface&lt;A&gt;</a></li>
     <li class="self-crumb">constructor TemplatedInterface</li>
   </ol>
   <div class="self-name">TemplatedInterface</div>
@@ -74,7 +74,7 @@ <h5>class TemplatedInterface</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">TemplatedInterface</span>(<wbr>)
+      <span class="name ">TemplatedInterface&lt;A&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aField.html b/testing/test_package_docs/ex/TemplatedInterface/aField.html
index ac8876e03b..d3ac180de3 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aField.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aField.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface&lt;A&gt;</a></li>
     <li class="self-crumb">property aField</li>
   </ol>
   <div class="self-name">aField</div>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aGetter.html b/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
index 5d33e95cc0..53f36a45b9 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aGetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface&lt;A&gt;</a></li>
     <li class="self-crumb">property aGetter</li>
   </ol>
   <div class="self-name">aGetter</div>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html b/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
index d31b512a46..699db3d46b 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aMethodInterface.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface&lt;A&gt;</a></li>
     <li class="self-crumb">abstract method aMethodInterface</li>
   </ol>
   <div class="self-name">aMethodInterface</div>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aSetter.html b/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
index ec20e946d0..bdda8219ee 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aSetter.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface&lt;A&gt;</a></li>
     <li class="self-crumb">property aSetter</li>
   </ol>
   <div class="self-name">aSetter</div>
diff --git a/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html b/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
index 97aac3527f..fd0a23a6db 100644
--- a/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
+++ b/testing/test_package_docs/ex/TemplatedInterface/aTypedefReturningMethodInterface.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface</a></li>
+    <li><a href="ex/TemplatedInterface-class.html">TemplatedInterface&lt;A&gt;</a></li>
     <li class="self-crumb">abstract method aTypedefReturningMethodInterface</li>
   </ol>
   <div class="self-name">aTypedefReturningMethodInterface</div>
diff --git a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html
index 32e29ef692..30a965c88a 100644
--- a/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html
+++ b/testing/test_package_docs/ex/TypedFunctionsWithoutTypedefs/TypedFunctionsWithoutTypedefs.html
@@ -66,7 +66,7 @@ <h5>class TypedFunctionsWithoutTypedefs</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">TypedFunctionsWithoutTypedefs</span>(<wbr>)
+      <span class="name ">TypedFunctionsWithoutTypedefs</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/WithGeneric/WithGeneric.html b/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
index ba39ec9d26..0cfa1e0f32 100644
--- a/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
+++ b/testing/test_package_docs/ex/WithGeneric/WithGeneric.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric&lt;T&gt;</a></li>
     <li class="self-crumb">constructor WithGeneric</li>
   </ol>
   <div class="self-name">WithGeneric</div>
@@ -64,7 +64,7 @@ <h5>class WithGeneric</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">WithGeneric</span>(<wbr><span class="parameter" id="-param-prop"><span class="type-annotation">T</span> <span class="parameter-name">prop</span></span>)
+      <span class="name ">WithGeneric&lt;T&gt;</span>(<wbr><span class="parameter" id="-param-prop"><span class="type-annotation">T</span> <span class="parameter-name">prop</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/WithGeneric/hashCode.html b/testing/test_package_docs/ex/WithGeneric/hashCode.html
index 806ec3cf22..38f7cee29c 100644
--- a/testing/test_package_docs/ex/WithGeneric/hashCode.html
+++ b/testing/test_package_docs/ex/WithGeneric/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric&lt;T&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html b/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
index 4e1a481c53..ffa56655e8 100644
--- a/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
+++ b/testing/test_package_docs/ex/WithGeneric/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric&lt;T&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/operator_equals.html b/testing/test_package_docs/ex/WithGeneric/operator_equals.html
index 4b3d745f0d..a437900952 100644
--- a/testing/test_package_docs/ex/WithGeneric/operator_equals.html
+++ b/testing/test_package_docs/ex/WithGeneric/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric&lt;T&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/prop.html b/testing/test_package_docs/ex/WithGeneric/prop.html
index 0f9926d320..a3db777ca5 100644
--- a/testing/test_package_docs/ex/WithGeneric/prop.html
+++ b/testing/test_package_docs/ex/WithGeneric/prop.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric&lt;T&gt;</a></li>
     <li class="self-crumb">property prop</li>
   </ol>
   <div class="self-name">prop</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/runtimeType.html b/testing/test_package_docs/ex/WithGeneric/runtimeType.html
index b4420e2e97..5eed01c037 100644
--- a/testing/test_package_docs/ex/WithGeneric/runtimeType.html
+++ b/testing/test_package_docs/ex/WithGeneric/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric&lt;T&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/ex/WithGeneric/toString.html b/testing/test_package_docs/ex/WithGeneric/toString.html
index beea05d635..955f7ae64c 100644
--- a/testing/test_package_docs/ex/WithGeneric/toString.html
+++ b/testing/test_package_docs/ex/WithGeneric/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="ex/ex-library.html">ex</a></li>
-    <li><a href="ex/WithGeneric-class.html">WithGeneric</a></li>
+    <li><a href="ex/WithGeneric-class.html">WithGeneric&lt;T&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/ex/WithGenericSub/WithGenericSub.html b/testing/test_package_docs/ex/WithGenericSub/WithGenericSub.html
index ac2322cfbe..e56d991065 100644
--- a/testing/test_package_docs/ex/WithGenericSub/WithGenericSub.html
+++ b/testing/test_package_docs/ex/WithGenericSub/WithGenericSub.html
@@ -64,7 +64,7 @@ <h5>class WithGenericSub</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">WithGenericSub</span>(<wbr><span class="parameter" id="-param-prop"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">prop</span></span>)
+      <span class="name ">WithGenericSub</span>(<wbr><span class="parameter" id="-param-prop"><span class="type-annotation"><a href="ex/Apple-class.html">Apple</a></span> <span class="parameter-name">prop</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/ex/aThingToDo/aThingToDo.html b/testing/test_package_docs/ex/aThingToDo/aThingToDo.html
index 0110478564..cb3e8939fb 100644
--- a/testing/test_package_docs/ex/aThingToDo/aThingToDo.html
+++ b/testing/test_package_docs/ex/aThingToDo/aThingToDo.html
@@ -65,7 +65,7 @@ <h5>class aThingToDo</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">aThingToDo</span>(<wbr><span class="parameter" id="-param-who"><span class="type-annotation">String</span> <span class="parameter-name">who</span>, </span> <span class="parameter" id="-param-what"><span class="type-annotation">String</span> <span class="parameter-name">what</span></span>)
+      <span class="name ">aThingToDo</span>(<wbr><span class="parameter" id="-param-who"><span class="type-annotation">String</span> <span class="parameter-name">who</span>, </span> <span class="parameter" id="-param-what"><span class="type-annotation">String</span> <span class="parameter-name">what</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
index 2237521625..6c1aeb845d 100644
--- a/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
+++ b/testing/test_package_docs/fake/AClassUsingASuperMixin-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html b/testing/test_package_docs/fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html
index 03ab259f66..9369f6521f 100644
--- a/testing/test_package_docs/fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html
+++ b/testing/test_package_docs/fake/AClassUsingASuperMixin/AClassUsingASuperMixin.html
@@ -64,7 +64,7 @@ <h5>class AClassUsingASuperMixin</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">AClassUsingASuperMixin</span>(<wbr>)
+      <span class="name ">AClassUsingASuperMixin</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/AMixinCallingSuper-class.html b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
index 3eec57a1ce..4c32dabee3 100644
--- a/testing/test_package_docs/fake/AMixinCallingSuper-class.html
+++ b/testing/test_package_docs/fake/AMixinCallingSuper-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/AMixinCallingSuper/AMixinCallingSuper.html b/testing/test_package_docs/fake/AMixinCallingSuper/AMixinCallingSuper.html
index 8cc5725633..63d5c69938 100644
--- a/testing/test_package_docs/fake/AMixinCallingSuper/AMixinCallingSuper.html
+++ b/testing/test_package_docs/fake/AMixinCallingSuper/AMixinCallingSuper.html
@@ -64,7 +64,7 @@ <h5>class AMixinCallingSuper</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">AMixinCallingSuper</span>(<wbr>)
+      <span class="name ">AMixinCallingSuper</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/Annotation-class.html b/testing/test_package_docs/fake/Annotation-class.html
index 924d828894..98caec6dcf 100644
--- a/testing/test_package_docs/fake/Annotation-class.html
+++ b/testing/test_package_docs/fake/Annotation-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Annotation/Annotation.html b/testing/test_package_docs/fake/Annotation/Annotation.html
index 532b50883b..5e12aa8f65 100644
--- a/testing/test_package_docs/fake/Annotation/Annotation.html
+++ b/testing/test_package_docs/fake/Annotation/Annotation.html
@@ -64,7 +64,7 @@ <h5>class Annotation</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">Annotation</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
+      <span class="name ">Annotation</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/AnotherInterface-class.html b/testing/test_package_docs/fake/AnotherInterface-class.html
index a934a9acbe..cc9d34b71f 100644
--- a/testing/test_package_docs/fake/AnotherInterface-class.html
+++ b/testing/test_package_docs/fake/AnotherInterface-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/AnotherInterface/AnotherInterface.html b/testing/test_package_docs/fake/AnotherInterface/AnotherInterface.html
index 53fae191f7..ce998f08a6 100644
--- a/testing/test_package_docs/fake/AnotherInterface/AnotherInterface.html
+++ b/testing/test_package_docs/fake/AnotherInterface/AnotherInterface.html
@@ -63,7 +63,7 @@ <h5>class AnotherInterface</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">AnotherInterface</span>(<wbr>)
+      <span class="name ">AnotherInterface</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/BaseForDocComments-class.html b/testing/test_package_docs/fake/BaseForDocComments-class.html
index 95638c0738..7d5e8ed4a7 100644
--- a/testing/test_package_docs/fake/BaseForDocComments-class.html
+++ b/testing/test_package_docs/fake/BaseForDocComments-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/BaseForDocComments/BaseForDocComments.html b/testing/test_package_docs/fake/BaseForDocComments/BaseForDocComments.html
index 99b7ff04b4..9d74e7b41f 100644
--- a/testing/test_package_docs/fake/BaseForDocComments/BaseForDocComments.html
+++ b/testing/test_package_docs/fake/BaseForDocComments/BaseForDocComments.html
@@ -65,7 +65,7 @@ <h5>class BaseForDocComments</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">BaseForDocComments</span>(<wbr>)
+      <span class="name ">BaseForDocComments</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/BaseThingy-class.html b/testing/test_package_docs/fake/BaseThingy-class.html
index 34de4523f4..8840f2eda9 100644
--- a/testing/test_package_docs/fake/BaseThingy-class.html
+++ b/testing/test_package_docs/fake/BaseThingy-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/BaseThingy/BaseThingy.html b/testing/test_package_docs/fake/BaseThingy/BaseThingy.html
index 818487395f..4af9cad29e 100644
--- a/testing/test_package_docs/fake/BaseThingy/BaseThingy.html
+++ b/testing/test_package_docs/fake/BaseThingy/BaseThingy.html
@@ -66,7 +66,7 @@ <h5>class BaseThingy</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">BaseThingy</span>(<wbr>)
+      <span class="name ">BaseThingy</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/BaseThingy2-class.html b/testing/test_package_docs/fake/BaseThingy2-class.html
index c91f98f039..036ee063cc 100644
--- a/testing/test_package_docs/fake/BaseThingy2-class.html
+++ b/testing/test_package_docs/fake/BaseThingy2-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/BaseThingy2/BaseThingy2.html b/testing/test_package_docs/fake/BaseThingy2/BaseThingy2.html
index f29c986ade..abdae084a8 100644
--- a/testing/test_package_docs/fake/BaseThingy2/BaseThingy2.html
+++ b/testing/test_package_docs/fake/BaseThingy2/BaseThingy2.html
@@ -66,7 +66,7 @@ <h5>class BaseThingy2</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">BaseThingy2</span>(<wbr>)
+      <span class="name ">BaseThingy2</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
index 629696d84b..aec999e00e 100644
--- a/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
+++ b/testing/test_package_docs/fake/CUSTOM_CLASS-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Callback2.html b/testing/test_package_docs/fake/Callback2.html
index f8aeeec96f..0d39b90ccc 100644
--- a/testing/test_package_docs/fake/Callback2.html
+++ b/testing/test_package_docs/fake/Callback2.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
index 39da106f9f..72de83aa1a 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html b/testing/test_package_docs/fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html
index 1d5a0260df..988ccd2c96 100644
--- a/testing/test_package_docs/fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html
+++ b/testing/test_package_docs/fake/ClassWithUnusualProperties/ClassWithUnusualProperties.html
@@ -76,7 +76,7 @@ <h5>class ClassWithUnusualProperties</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">ClassWithUnusualProperties</span>(<wbr>)
+      <span class="name ">ClassWithUnusualProperties</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/Color-class.html b/testing/test_package_docs/fake/Color-class.html
index abe842aa54..2749819d28 100644
--- a/testing/test_package_docs/fake/Color-class.html
+++ b/testing/test_package_docs/fake/Color-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/ConstantClass-class.html b/testing/test_package_docs/fake/ConstantClass-class.html
index 5db18e3712..96cf1c38db 100644
--- a/testing/test_package_docs/fake/ConstantClass-class.html
+++ b/testing/test_package_docs/fake/ConstantClass-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/ConstantClass/ConstantClass.html b/testing/test_package_docs/fake/ConstantClass/ConstantClass.html
index 758d5caf0e..6a03fc14a7 100644
--- a/testing/test_package_docs/fake/ConstantClass/ConstantClass.html
+++ b/testing/test_package_docs/fake/ConstantClass/ConstantClass.html
@@ -66,7 +66,7 @@ <h5>class ConstantClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">ConstantClass</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
+      <span class="name ">ConstantClass</span>(<wbr><span class="parameter" id="-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
     </section>
 
     <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/ConstantClass/ConstantClass.isVeryConstant.html b/testing/test_package_docs/fake/ConstantClass/ConstantClass.isVeryConstant.html
index 5cb906f337..362b0a51ba 100644
--- a/testing/test_package_docs/fake/ConstantClass/ConstantClass.isVeryConstant.html
+++ b/testing/test_package_docs/fake/ConstantClass/ConstantClass.isVeryConstant.html
@@ -66,7 +66,7 @@ <h5>class ConstantClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">ConstantClass.isVeryConstant</span>(<wbr><span class="parameter" id="isVeryConstant-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
+      <span class="name ">ConstantClass.isVeryConstant</span>(<wbr><span class="parameter" id="isVeryConstant-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
     </section>
 
     <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/ConstantClass/ConstantClass.notConstant.html b/testing/test_package_docs/fake/ConstantClass/ConstantClass.notConstant.html
index 4e64cd824b..1256943286 100644
--- a/testing/test_package_docs/fake/ConstantClass/ConstantClass.notConstant.html
+++ b/testing/test_package_docs/fake/ConstantClass/ConstantClass.notConstant.html
@@ -66,7 +66,7 @@ <h5>class ConstantClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">ConstantClass.notConstant</span>(<wbr><span class="parameter" id="notConstant-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
+      <span class="name ">ConstantClass.notConstant</span>(<wbr><span class="parameter" id="notConstant-param-value"><span class="type-annotation">String</span> <span class="parameter-name">value</span></span>)
     </section>
 
     <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/ConstructorTester-class.html b/testing/test_package_docs/fake/ConstructorTester-class.html
new file mode 100644
index 0000000000..3a46ab69d7
--- /dev/null
+++ b/testing/test_package_docs/fake/ConstructorTester-class.html
@@ -0,0 +1,262 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the ConstructorTester class from the fake library, for the Dart programming language.">
+  <title>ConstructorTester class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li class="self-crumb">class ConstructorTester&lt;A, B&gt;</li>
+  </ol>
+  <div class="self-name">ConstructorTester</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>library fake</h5>
+    <ol>
+      <li class="section-title"><a href="fake/fake-library.html#classes">Classes</a></li>
+      <li><a href="fake/AClassUsingASuperMixin-class.html">AClassUsingASuperMixin</a></li>
+      <li><a href="fake/AMixinCallingSuper-class.html">AMixinCallingSuper</a></li>
+      <li><a href="fake/Annotation-class.html">Annotation</a></li>
+      <li><a href="fake/AnotherInterface-class.html">AnotherInterface</a></li>
+      <li><a href="fake/BaseForDocComments-class.html">BaseForDocComments</a></li>
+      <li><a href="fake/BaseThingy-class.html">BaseThingy</a></li>
+      <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
+      <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
+      <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
+      <li><a href="fake/Cool-class.html">Cool</a></li>
+      <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+      <li><a href="fake/Foo2-class.html">Foo2</a></li>
+      <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+      <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+      <li><a href="fake/ImplementingThingy-class.html">ImplementingThingy</a></li>
+      <li><a href="fake/ImplementingThingy2-class.html">ImplementingThingy2</a></li>
+      <li><a href="fake/ImplicitProperties-class.html">ImplicitProperties</a></li>
+      <li><a href="fake/Interface-class.html">Interface</a></li>
+      <li><a href="fake/LongFirstLine-class.html">LongFirstLine</a></li>
+      <li><a href="fake/MixMeIn-class.html">MixMeIn</a></li>
+      <li><a href="fake/NotAMixin-class.html">NotAMixin</a></li>
+      <li><a href="fake/OperatorReferenceClass-class.html">OperatorReferenceClass</a></li>
+      <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+      <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+      <li><a href="fake/SubForDocComments-class.html">SubForDocComments</a></li>
+      <li><a class="deprecated" href="fake/SuperAwesomeClass-class.html">SuperAwesomeClass</a></li>
+      <li><a href="fake/WithGetterAndSetter-class.html">WithGetterAndSetter</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#constants">Constants</a></li>
+      <li><a href="fake/CUSTOM_CLASS-constant.html">CUSTOM_CLASS</a></li>
+      <li><a class="deprecated" href="fake/DOWN-constant.html">DOWN</a></li>
+      <li><a href="fake/greatAnnotation-constant.html">greatAnnotation</a></li>
+      <li><a href="fake/greatestAnnotation-constant.html">greatestAnnotation</a></li>
+      <li><a href="fake/incorrectDocReference-constant.html">incorrectDocReference</a></li>
+      <li><a href="fake/NAME_SINGLEUNDERSCORE-constant.html">NAME_SINGLEUNDERSCORE</a></li>
+      <li><a href="fake/NAME_WITH_TWO_UNDERSCORES-constant.html">NAME_WITH_TWO_UNDERSCORES</a></li>
+      <li><a href="fake/PI-constant.html">PI</a></li>
+      <li><a href="fake/required-constant.html">required</a></li>
+      <li><a href="fake/testingCodeSyntaxInOneLiners-constant.html">testingCodeSyntaxInOneLiners</a></li>
+      <li><a href="fake/UP-constant.html">UP</a></li>
+      <li><a href="fake/ZERO-constant.html">ZERO</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#properties">Properties</a></li>
+      <li><a href="fake/dynamicGetter.html">dynamicGetter</a></li>
+      <li><a href="fake/getterSetterNodocGetter.html">getterSetterNodocGetter</a></li>
+      <li><a href="fake/getterSetterNodocSetter.html">getterSetterNodocSetter</a></li>
+      <li><a href="fake/justGetter.html">justGetter</a></li>
+      <li><a href="fake/justSetter.html">justSetter</a></li>
+      <li><a href="fake/mapWithDynamicKeys.html">mapWithDynamicKeys</a></li>
+      <li><a class="deprecated" href="fake/meaningOfLife.html">meaningOfLife</a></li>
+      <li><a href="fake/setAndGet.html">setAndGet</a></li>
+      <li><a href="fake/simpleProperty.html">simpleProperty</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#functions">Functions</a></li>
+      <li><a href="fake/addCallback.html">addCallback</a></li>
+      <li><a href="fake/addCallback2.html">addCallback2</a></li>
+      <li><a href="fake/functionWithFunctionParameters.html">functionWithFunctionParameters</a></li>
+      <li><a href="fake/myGenericFunction.html">myGenericFunction</a></li>
+      <li><a href="fake/onlyPositionalWithNoDefaultNoType.html">onlyPositionalWithNoDefaultNoType</a></li>
+      <li><a href="fake/paintImage1.html">paintImage1</a></li>
+      <li><a href="fake/paintImage2.html">paintImage2</a></li>
+      <li><a href="fake/paramFromAnotherLib.html">paramFromAnotherLib</a></li>
+      <li><a href="fake/short.html">short</a></li>
+      <li><a href="fake/soIntense.html">soIntense</a></li>
+      <li><a href="fake/thisIsAlsoAsync.html">thisIsAlsoAsync</a></li>
+      <li><a href="fake/thisIsAsync.html">thisIsAsync</a></li>
+      <li><a class="deprecated" href="fake/topLevelFunction.html">topLevelFunction</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#enums">Enums</a></li>
+      <li><a href="fake/Color-class.html">Color</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#typedefs">Typedefs</a></li>
+      <li><a href="fake/Callback2.html">Callback2</a></li>
+      <li><a class="deprecated" href="fake/FakeProcesses.html">FakeProcesses</a></li>
+      <li><a href="fake/GenericTypedef.html">GenericTypedef</a></li>
+      <li><a href="fake/LotsAndLotsOfParameters.html">LotsAndLotsOfParameters</a></li>
+      <li><a href="fake/myCoolTypedef.html">myCoolTypedef</a></li>
+      <li><a href="fake/NewGenericTypedef.html">NewGenericTypedef</a></li>
+      <li><a href="fake/VoidCallback.html">VoidCallback</a></li>
+    
+      <li class="section-title"><a href="fake/fake-library.html#exceptions">Exceptions</a></li>
+      <li><a class="deprecated" href="fake/Doh-class.html">Doh</a></li>
+      <li><a href="fake/Oops-class.html">Oops</a></li>
+    </ol>
+  </div>
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+
+    
+
+    <section class="summary offset-anchor" id="constructors">
+      <h2>Constructors</h2>
+
+      <dl class="constructor-summary-list">
+        <dt id="ConstructorTester" class="callable">
+          <span class="name"><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></span><span class="signature">(<span class="parameter" id="-param-param1"><span class="type-annotation">String</span> <span class="parameter-name">param1</span></span>)</span>
+        </dt>
+        <dd>
+          
+        </dd>
+        <dt id="ConstructorTester.fromSomething" class="callable">
+          <span class="name"><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">ConstructorTester.fromSomething</a></span><span class="signature">(<span class="parameter" id="fromSomething-param-foo"><span class="type-annotation">A</span> <span class="parameter-name">foo</span></span>)</span>
+        </dt>
+        <dd>
+          
+        </dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-properties">
+      <h2>Properties</h2>
+
+      <dl class="properties">
+        <dt id="hashCode" class="property inherited">
+          <span class="name"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></span>
+          <span class="signature">&#8594; int</span>
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+        <dt id="runtimeType" class="property inherited">
+          <span class="name"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></span>
+          <span class="signature">&#8594; Type</span>
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">read-only, inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="instance-methods">
+      <h2>Methods</h2>
+      <dl class="callables">
+        <dt id="noSuchMethod" class="callable inherited">
+          <span class="name"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></span><span class="signature">(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+            <span class="returntype parameter">&#8594; dynamic</span>
+          </span>
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+        <dt id="toString" class="callable inherited">
+          <span class="name"><a href="fake/ConstructorTester/toString.html">toString</a></span><span class="signature">(<wbr>)
+            <span class="returntype parameter">&#8594; String</span>
+          </span>
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+    <section class="summary offset-anchor inherited" id="operators">
+      <h2>Operators</h2>
+      <dl class="callables">
+        <dt id="operator ==" class="callable inherited">
+          <span class="name"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></span><span class="signature">(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
+            <span class="returntype parameter">&#8594; bool</span>
+          </span>
+        </dt>
+        <dd class="inherited">
+          
+          <div class="features">inherited</div>
+</dd>
+      </dl>
+    </section>
+
+
+
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>class ConstructorTester</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">fromSomething</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/ConstructorTester-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
new file mode 100644
index 0000000000..49a53c81e6
--- /dev/null
+++ b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.fromSomething.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the ConstructorTester.fromSomething constructor from the Class ConstructorTester class from the fake library, for the Dart programming language.">
+  <title>ConstructorTester.fromSomething constructor - ConstructorTester class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester&lt;A, B&gt;</a></li>
+    <li class="self-crumb">constructor ConstructorTester.fromSomething</li>
+  </ol>
+  <div class="self-name">ConstructorTester.fromSomething</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>class ConstructorTester</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">fromSomething</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/ConstructorTester-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <section class="multi-line-signature">
+      
+      <span class="name ">ConstructorTester&lt;A, B&gt;.fromSomething</span>(<wbr><span class="parameter" id="fromSomething-param-foo"><span class="type-annotation">A</span> <span class="parameter-name">foo</span></span>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>constructor ConstructorTester.fromSomething</h5>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
new file mode 100644
index 0000000000..deddd64e3c
--- /dev/null
+++ b/testing/test_package_docs/fake/ConstructorTester/ConstructorTester.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the ConstructorTester constructor from the Class ConstructorTester class from the fake library, for the Dart programming language.">
+  <title>ConstructorTester constructor - ConstructorTester class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester&lt;A, B&gt;</a></li>
+    <li class="self-crumb">constructor ConstructorTester</li>
+  </ol>
+  <div class="self-name">ConstructorTester</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>class ConstructorTester</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">fromSomething</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/ConstructorTester-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-left-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <section class="multi-line-signature">
+      
+      <span class="name ">ConstructorTester&lt;A, B&gt;</span>(<wbr><span class="parameter" id="-param-param1"><span class="type-annotation">String</span> <span class="parameter-name">param1</span></span>)
+    </section>
+
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>constructor ConstructorTester</h5>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ConstructorTester/hashCode.html b/testing/test_package_docs/fake/ConstructorTester/hashCode.html
new file mode 100644
index 0000000000..765ebb103c
--- /dev/null
+++ b/testing/test_package_docs/fake/ConstructorTester/hashCode.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the hashCode property from the ConstructorTester class, for the Dart programming language.">
+  <title>hashCode property - ConstructorTester class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester&lt;A, B&gt;</a></li>
+    <li class="self-crumb">property hashCode</li>
+  </ol>
+  <div class="self-name">hashCode</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>class ConstructorTester</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">fromSomething</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/ConstructorTester-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">int</span>
+          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>property hashCode</h5>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html b/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html
new file mode 100644
index 0000000000..af4ee84ac0
--- /dev/null
+++ b/testing/test_package_docs/fake/ConstructorTester/noSuchMethod.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the noSuchMethod method from the ConstructorTester class, for the Dart programming language.">
+  <title>noSuchMethod method - ConstructorTester class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester&lt;A, B&gt;</a></li>
+    <li class="self-crumb">method noSuchMethod</li>
+  </ol>
+  <div class="self-name">noSuchMethod</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>class ConstructorTester</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">fromSomething</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/ConstructorTester-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <section class="multi-line-signature">
+      <span class="returntype">dynamic</span>
+      <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>method noSuchMethod</h5>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ConstructorTester/operator_equals.html b/testing/test_package_docs/fake/ConstructorTester/operator_equals.html
new file mode 100644
index 0000000000..eec0667af0
--- /dev/null
+++ b/testing/test_package_docs/fake/ConstructorTester/operator_equals.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the operator == method from the ConstructorTester class, for the Dart programming language.">
+  <title>operator == method - ConstructorTester class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester&lt;A, B&gt;</a></li>
+    <li class="self-crumb">method operator ==</li>
+  </ol>
+  <div class="self-name">operator ==</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>class ConstructorTester</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">fromSomething</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/ConstructorTester-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <section class="multi-line-signature">
+      <span class="returntype">bool</span>
+      <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>method operator ==</h5>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ConstructorTester/runtimeType.html b/testing/test_package_docs/fake/ConstructorTester/runtimeType.html
new file mode 100644
index 0000000000..5945b099c8
--- /dev/null
+++ b/testing/test_package_docs/fake/ConstructorTester/runtimeType.html
@@ -0,0 +1,100 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the runtimeType property from the ConstructorTester class, for the Dart programming language.">
+  <title>runtimeType property - ConstructorTester class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester&lt;A, B&gt;</a></li>
+    <li class="self-crumb">property runtimeType</li>
+  </ol>
+  <div class="self-name">runtimeType</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>class ConstructorTester</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">fromSomething</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/ConstructorTester-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+
+        <section id="getter">
+        
+        <section class="multi-line-signature">
+          <span class="returntype">Type</span>
+          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+</section>
+        
+        
+</section>
+        
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>property runtimeType</h5>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/ConstructorTester/toString.html b/testing/test_package_docs/fake/ConstructorTester/toString.html
new file mode 100644
index 0000000000..358d72daa5
--- /dev/null
+++ b/testing/test_package_docs/fake/ConstructorTester/toString.html
@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="description" content="API docs for the toString method from the ConstructorTester class, for the Dart programming language.">
+  <title>toString method - ConstructorTester class - fake library - Dart API</title>
+  <!-- required because all the links are pseudo-absolute -->
+  <base href="../..">
+
+  <link href="https://fonts.googleapis.com/css?family=Source+Code+Pro:500,400i,400,300|Source+Sans+Pro:400,300,700" rel="stylesheet">
+  <link rel="stylesheet" href="static-assets/github.css">
+  <link rel="stylesheet" href="static-assets/styles.css">
+  <link rel="icon" href="static-assets/favicon.png">
+
+</head>
+
+<body>
+
+<div id="overlay-under-drawer"></div>
+
+<header id="title">
+  <button id="sidenav-left-toggle" type="button">&nbsp;</button>
+  <ol class="breadcrumbs gt-separated dark hidden-xs">
+    <li><a href="index.html">test_package</a></li>
+    <li><a href="fake/fake-library.html">fake</a></li>
+    <li><a href="fake/ConstructorTester-class.html">ConstructorTester&lt;A, B&gt;</a></li>
+    <li class="self-crumb">method toString</li>
+  </ol>
+  <div class="self-name">toString</div>
+  <form class="search navbar-right" role="search">
+    <input type="text" id="search-box" autocomplete="off" disabled class="form-control typeahead" placeholder="Loading search...">
+  </form>
+</header>
+
+<main>
+
+  <div class="col-xs-6 col-sm-3 col-md-2 sidebar sidebar-offcanvas-left">
+    <h5>class ConstructorTester</h5>
+    <ol>
+      <li class="section-title"><a href="fake/ConstructorTester-class.html#constructors">Constructors</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.html">ConstructorTester</a></li>
+      <li><a href="fake/ConstructorTester/ConstructorTester.fromSomething.html">fromSomething</a></li>
+    
+      <li class="section-title inherited">
+        <a href="fake/ConstructorTester-class.html#instance-properties">Properties</a>
+      </li>
+      <li class="inherited"><a href="fake/ConstructorTester/hashCode.html">hashCode</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/runtimeType.html">runtimeType</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#instance-methods">Methods</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/noSuchMethod.html">noSuchMethod</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/toString.html">toString</a></li>
+    
+      <li class="section-title inherited"><a href="fake/ConstructorTester-class.html#operators">Operators</a></li>
+      <li class="inherited"><a href="fake/ConstructorTester/operator_equals.html">operator ==</a></li>
+    
+    
+    
+    </ol>
+  </div><!--/.sidebar-offcanvas-->
+
+  <div class="col-xs-12 col-sm-9 col-md-8 main-content">
+    <section class="multi-line-signature">
+      <span class="returntype">String</span>
+      <span class="name ">toString</span>(<wbr>)
+    </section>
+    
+    
+
+  </div> <!-- /.main-content -->
+
+  <div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
+    <h5>method toString</h5>
+  </div><!--/.sidebar-offcanvas-->
+
+</main>
+
+<footer>
+  <span class="no-break">
+    test_package 0.0.1
+  </span>
+
+</footer>
+
+<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+<script src="static-assets/typeahead.bundle.min.js"></script>
+<script src="static-assets/highlight.pack.js"></script>
+<script src="static-assets/URI.js"></script>
+<script src="static-assets/script.js"></script>
+
+
+</body>
+
+</html>
diff --git a/testing/test_package_docs/fake/Cool-class.html b/testing/test_package_docs/fake/Cool-class.html
index 44031461d4..5877a9bb6e 100644
--- a/testing/test_package_docs/fake/Cool-class.html
+++ b/testing/test_package_docs/fake/Cool-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Cool/Cool.html b/testing/test_package_docs/fake/Cool/Cool.html
index 8bb21b9977..7b6721f8db 100644
--- a/testing/test_package_docs/fake/Cool/Cool.html
+++ b/testing/test_package_docs/fake/Cool/Cool.html
@@ -64,7 +64,7 @@ <h5>class Cool</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Cool</span>(<wbr>)
+      <span class="name ">Cool</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/DOWN-constant.html b/testing/test_package_docs/fake/DOWN-constant.html
index 9a882595cb..d1f664a219 100644
--- a/testing/test_package_docs/fake/DOWN-constant.html
+++ b/testing/test_package_docs/fake/DOWN-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Doh-class.html b/testing/test_package_docs/fake/Doh-class.html
index b8f526ab3d..e6ab2f1784 100644
--- a/testing/test_package_docs/fake/Doh-class.html
+++ b/testing/test_package_docs/fake/Doh-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Doh/Doh.html b/testing/test_package_docs/fake/Doh/Doh.html
index 2f918d3930..7022e31984 100644
--- a/testing/test_package_docs/fake/Doh/Doh.html
+++ b/testing/test_package_docs/fake/Doh/Doh.html
@@ -64,7 +64,7 @@ <h5>class Doh</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Doh</span>(<wbr>)
+      <span class="name ">Doh</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/ExtraSpecialList-class.html b/testing/test_package_docs/fake/ExtraSpecialList-class.html
index 6e5bf0c8d9..e74fc88f6f 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList-class.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html b/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
index 64793473e9..b5af60dba8 100644
--- a/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
+++ b/testing/test_package_docs/fake/ExtraSpecialList/ExtraSpecialList.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
+    <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">constructor ExtraSpecialList</li>
   </ol>
   <div class="self-name">ExtraSpecialList</div>
@@ -115,7 +115,7 @@ <h5>class ExtraSpecialList</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">ExtraSpecialList</span>(<wbr>)
+      <span class="name ">ExtraSpecialList&lt;E&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/FakeProcesses.html b/testing/test_package_docs/fake/FakeProcesses.html
index 95646ab26b..f9126f27c9 100644
--- a/testing/test_package_docs/fake/FakeProcesses.html
+++ b/testing/test_package_docs/fake/FakeProcesses.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Foo2-class.html b/testing/test_package_docs/fake/Foo2-class.html
index 7c55c95ace..a244cbceb5 100644
--- a/testing/test_package_docs/fake/Foo2-class.html
+++ b/testing/test_package_docs/fake/Foo2-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Foo2/Foo2.html b/testing/test_package_docs/fake/Foo2/Foo2.html
index 4966ee9076..e0615abece 100644
--- a/testing/test_package_docs/fake/Foo2/Foo2.html
+++ b/testing/test_package_docs/fake/Foo2/Foo2.html
@@ -67,7 +67,7 @@ <h5>class Foo2</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       const
-            <span class="name ">Foo2</span>(<wbr><span class="parameter" id="-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
+      <span class="name ">Foo2</span>(<wbr><span class="parameter" id="-param-index"><span class="type-annotation">int</span> <span class="parameter-name">index</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/GenericTypedef.html b/testing/test_package_docs/fake/GenericTypedef.html
index bc8f4d1b60..e6ead83891 100644
--- a/testing/test_package_docs/fake/GenericTypedef.html
+++ b/testing/test_package_docs/fake/GenericTypedef.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends-class.html b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
index 198d58ac3d..58dee2c272 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends-class.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html b/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
index db5cae2589..139ab2f836 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/HasGenericWithExtends.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends&lt;T extends Foo2&gt;</a></li>
     <li class="self-crumb">constructor HasGenericWithExtends</li>
   </ol>
   <div class="self-name">HasGenericWithExtends</div>
@@ -63,7 +63,7 @@ <h5>class HasGenericWithExtends</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">HasGenericWithExtends</span>(<wbr>)
+      <span class="name ">HasGenericWithExtends&lt;T extends Foo2&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
index 9badb35a59..4ff739f9ca 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends&lt;T extends Foo2&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html b/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
index 0688cdb4e9..676c420980 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends&lt;T extends Foo2&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html b/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
index 325250a9e8..c3caee68f5 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends&lt;T extends Foo2&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html b/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
index 33da8e941d..51083750a1 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends&lt;T extends Foo2&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/HasGenericWithExtends/toString.html b/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
index 3ad2a3f820..901c5803b2 100644
--- a/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
+++ b/testing/test_package_docs/fake/HasGenericWithExtends/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends</a></li>
+    <li><a href="fake/HasGenericWithExtends-class.html">HasGenericWithExtends&lt;T extends Foo2&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/HasGenerics-class.html b/testing/test_package_docs/fake/HasGenerics-class.html
index 08e5885f1e..4128e01365 100644
--- a/testing/test_package_docs/fake/HasGenerics-class.html
+++ b/testing/test_package_docs/fake/HasGenerics-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/HasGenerics/HasGenerics.html b/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
index 36d08ecae8..7dab3eb5af 100644
--- a/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
+++ b/testing/test_package_docs/fake/HasGenerics/HasGenerics.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">constructor HasGenerics</li>
   </ol>
   <div class="self-name">HasGenerics</div>
@@ -67,7 +67,7 @@ <h5>class HasGenerics</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">HasGenerics</span>(<wbr><span class="parameter" id="-param-x"><span class="type-annotation">X</span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="-param-y"><span class="type-annotation">Y</span> <span class="parameter-name">y</span>, </span> <span class="parameter" id="-param-z"><span class="type-annotation">Z</span> <span class="parameter-name">z</span></span>)
+      <span class="name ">HasGenerics&lt;X, Y, Z&gt;</span>(<wbr><span class="parameter" id="-param-x"><span class="type-annotation">X</span> <span class="parameter-name">x</span>, </span> <span class="parameter" id="-param-y"><span class="type-annotation">Y</span> <span class="parameter-name">y</span>, </span> <span class="parameter" id="-param-z"><span class="type-annotation">Z</span> <span class="parameter-name">z</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/HasGenerics/convertToMap.html b/testing/test_package_docs/fake/HasGenerics/convertToMap.html
index 1ad3082504..5006a132ef 100644
--- a/testing/test_package_docs/fake/HasGenerics/convertToMap.html
+++ b/testing/test_package_docs/fake/HasGenerics/convertToMap.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">method convertToMap</li>
   </ol>
   <div class="self-name">convertToMap</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/doStuff.html b/testing/test_package_docs/fake/HasGenerics/doStuff.html
index 30fea09dcd..537a74060a 100644
--- a/testing/test_package_docs/fake/HasGenerics/doStuff.html
+++ b/testing/test_package_docs/fake/HasGenerics/doStuff.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">method doStuff</li>
   </ol>
   <div class="self-name">doStuff</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/hashCode.html b/testing/test_package_docs/fake/HasGenerics/hashCode.html
index 4fe354ca66..34e0477fe7 100644
--- a/testing/test_package_docs/fake/HasGenerics/hashCode.html
+++ b/testing/test_package_docs/fake/HasGenerics/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html b/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
index 2d585489b5..1be46e50c3 100644
--- a/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
+++ b/testing/test_package_docs/fake/HasGenerics/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/operator_equals.html b/testing/test_package_docs/fake/HasGenerics/operator_equals.html
index d2387a21ce..167c081787 100644
--- a/testing/test_package_docs/fake/HasGenerics/operator_equals.html
+++ b/testing/test_package_docs/fake/HasGenerics/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/returnX.html b/testing/test_package_docs/fake/HasGenerics/returnX.html
index 7a215f5aba..ae89d28f59 100644
--- a/testing/test_package_docs/fake/HasGenerics/returnX.html
+++ b/testing/test_package_docs/fake/HasGenerics/returnX.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">method returnX</li>
   </ol>
   <div class="self-name">returnX</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/returnZ.html b/testing/test_package_docs/fake/HasGenerics/returnZ.html
index 0297850f91..ed7be6c918 100644
--- a/testing/test_package_docs/fake/HasGenerics/returnZ.html
+++ b/testing/test_package_docs/fake/HasGenerics/returnZ.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">method returnZ</li>
   </ol>
   <div class="self-name">returnZ</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/runtimeType.html b/testing/test_package_docs/fake/HasGenerics/runtimeType.html
index 477bdb64bc..4944b45ecf 100644
--- a/testing/test_package_docs/fake/HasGenerics/runtimeType.html
+++ b/testing/test_package_docs/fake/HasGenerics/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/HasGenerics/toString.html b/testing/test_package_docs/fake/HasGenerics/toString.html
index 87e0aa3ddb..e8d541f707 100644
--- a/testing/test_package_docs/fake/HasGenerics/toString.html
+++ b/testing/test_package_docs/fake/HasGenerics/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/HasGenerics-class.html">HasGenerics</a></li>
+    <li><a href="fake/HasGenerics-class.html">HasGenerics&lt;X, Y, Z&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/ImplementingThingy-class.html b/testing/test_package_docs/fake/ImplementingThingy-class.html
index 7db8d39d1f..dab2fff6ed 100644
--- a/testing/test_package_docs/fake/ImplementingThingy-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/ImplementingThingy/ImplementingThingy.html b/testing/test_package_docs/fake/ImplementingThingy/ImplementingThingy.html
index 80240e5e97..5973d97db4 100644
--- a/testing/test_package_docs/fake/ImplementingThingy/ImplementingThingy.html
+++ b/testing/test_package_docs/fake/ImplementingThingy/ImplementingThingy.html
@@ -66,7 +66,7 @@ <h5>class ImplementingThingy</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">ImplementingThingy</span>(<wbr>)
+      <span class="name ">ImplementingThingy</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/ImplementingThingy2-class.html b/testing/test_package_docs/fake/ImplementingThingy2-class.html
index 921862b74a..d737bac678 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2-class.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/ImplementingThingy2/ImplementingThingy2.html b/testing/test_package_docs/fake/ImplementingThingy2/ImplementingThingy2.html
index 4d0c913cfa..c76b8e0388 100644
--- a/testing/test_package_docs/fake/ImplementingThingy2/ImplementingThingy2.html
+++ b/testing/test_package_docs/fake/ImplementingThingy2/ImplementingThingy2.html
@@ -66,7 +66,7 @@ <h5>class ImplementingThingy2</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">ImplementingThingy2</span>(<wbr>)
+      <span class="name ">ImplementingThingy2</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/ImplicitProperties-class.html b/testing/test_package_docs/fake/ImplicitProperties-class.html
index f37534a799..f39d52e385 100644
--- a/testing/test_package_docs/fake/ImplicitProperties-class.html
+++ b/testing/test_package_docs/fake/ImplicitProperties-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/ImplicitProperties/ImplicitProperties.html b/testing/test_package_docs/fake/ImplicitProperties/ImplicitProperties.html
index 914c6215a8..2987ce4ef3 100644
--- a/testing/test_package_docs/fake/ImplicitProperties/ImplicitProperties.html
+++ b/testing/test_package_docs/fake/ImplicitProperties/ImplicitProperties.html
@@ -68,7 +68,7 @@ <h5>class ImplicitProperties</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">ImplicitProperties</span>(<wbr>)
+      <span class="name ">ImplicitProperties</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/Interface-class.html b/testing/test_package_docs/fake/Interface-class.html
index 30578c2049..d0e094e4a0 100644
--- a/testing/test_package_docs/fake/Interface-class.html
+++ b/testing/test_package_docs/fake/Interface-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Interface/Interface.html b/testing/test_package_docs/fake/Interface/Interface.html
index 581e10512d..8e31238d72 100644
--- a/testing/test_package_docs/fake/Interface/Interface.html
+++ b/testing/test_package_docs/fake/Interface/Interface.html
@@ -63,7 +63,7 @@ <h5>class Interface</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Interface</span>(<wbr>)
+      <span class="name ">Interface</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/LongFirstLine-class.html b/testing/test_package_docs/fake/LongFirstLine-class.html
index 9ac125cd94..3dd05d3963 100644
--- a/testing/test_package_docs/fake/LongFirstLine-class.html
+++ b/testing/test_package_docs/fake/LongFirstLine-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromHasGenerics.html b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromHasGenerics.html
index eba34f9336..283902c703 100644
--- a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromHasGenerics.html
+++ b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromHasGenerics.html
@@ -87,7 +87,7 @@ <h5>class LongFirstLine</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">LongFirstLine.fromHasGenerics</span>(<wbr><span class="parameter" id="fromHasGenerics-param-hg"><span class="type-annotation"><a href="fake/HasGenerics-class.html">HasGenerics</a></span> <span class="parameter-name">hg</span></span>)
+      <span class="name ">LongFirstLine.fromHasGenerics</span>(<wbr><span class="parameter" id="fromHasGenerics-param-hg"><span class="type-annotation"><a href="fake/HasGenerics-class.html">HasGenerics</a></span> <span class="parameter-name">hg</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromMap.html b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromMap.html
index fd42e68d86..81c1654642 100644
--- a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromMap.html
+++ b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.fromMap.html
@@ -87,7 +87,7 @@ <h5>class LongFirstLine</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">LongFirstLine.fromMap</span>(<wbr><span class="parameter" id="fromMap-param-data"><span class="type-annotation">Map</span> <span class="parameter-name">data</span></span>)
+      <span class="name ">LongFirstLine.fromMap</span>(<wbr><span class="parameter" id="fromMap-param-data"><span class="type-annotation">Map</span> <span class="parameter-name">data</span></span>)
     </section>
 
     <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.html b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.html
index eba83cf006..a2890a6fa3 100644
--- a/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.html
+++ b/testing/test_package_docs/fake/LongFirstLine/LongFirstLine.html
@@ -86,8 +86,13 @@ <h5>class LongFirstLine</h5>
 
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
+      <div>
+        <ol class="annotation-list">
+          <li>@deprecated</li>
+        </ol>
+      </div>
       
-            <span class="name deprecated">LongFirstLine</span>(<wbr>)
+      <span class="name deprecated">LongFirstLine</span>(<wbr>)
     </section>
 
     <section class="desc markdown">
diff --git a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
index 66db5fe301..86c96b84b4 100644
--- a/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
+++ b/testing/test_package_docs/fake/LotsAndLotsOfParameters.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/MixMeIn-class.html b/testing/test_package_docs/fake/MixMeIn-class.html
index a3f397d8bc..97eec98f85 100644
--- a/testing/test_package_docs/fake/MixMeIn-class.html
+++ b/testing/test_package_docs/fake/MixMeIn-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/MixMeIn/MixMeIn.html b/testing/test_package_docs/fake/MixMeIn/MixMeIn.html
index 1624b0d97b..1246567855 100644
--- a/testing/test_package_docs/fake/MixMeIn/MixMeIn.html
+++ b/testing/test_package_docs/fake/MixMeIn/MixMeIn.html
@@ -63,7 +63,7 @@ <h5>class MixMeIn</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">MixMeIn</span>(<wbr>)
+      <span class="name ">MixMeIn</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
index 99e6bc1eab..400efc0c67 100644
--- a/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
+++ b/testing/test_package_docs/fake/NAME_SINGLEUNDERSCORE-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
index d7d1eb2efd..4703f454f2 100644
--- a/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
+++ b/testing/test_package_docs/fake/NAME_WITH_TWO_UNDERSCORES-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/NewGenericTypedef.html b/testing/test_package_docs/fake/NewGenericTypedef.html
index 669b2e0fb2..f40645f3d6 100644
--- a/testing/test_package_docs/fake/NewGenericTypedef.html
+++ b/testing/test_package_docs/fake/NewGenericTypedef.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/NotAMixin-class.html b/testing/test_package_docs/fake/NotAMixin-class.html
index 929654e5e6..88461cd302 100644
--- a/testing/test_package_docs/fake/NotAMixin-class.html
+++ b/testing/test_package_docs/fake/NotAMixin-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/NotAMixin/NotAMixin.html b/testing/test_package_docs/fake/NotAMixin/NotAMixin.html
index 37d131343e..2403781a1e 100644
--- a/testing/test_package_docs/fake/NotAMixin/NotAMixin.html
+++ b/testing/test_package_docs/fake/NotAMixin/NotAMixin.html
@@ -64,7 +64,7 @@ <h5>class NotAMixin</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">NotAMixin</span>(<wbr>)
+      <span class="name ">NotAMixin</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/Oops-class.html b/testing/test_package_docs/fake/Oops-class.html
index 887938c27e..5792b79e68 100644
--- a/testing/test_package_docs/fake/Oops-class.html
+++ b/testing/test_package_docs/fake/Oops-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/Oops/Oops.html b/testing/test_package_docs/fake/Oops/Oops.html
index 6fcfc11e10..04e37ef177 100644
--- a/testing/test_package_docs/fake/Oops/Oops.html
+++ b/testing/test_package_docs/fake/Oops/Oops.html
@@ -64,7 +64,7 @@ <h5>class Oops</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Oops</span>(<wbr><span class="parameter" id="-param-message"><span class="type-annotation">String</span> <span class="parameter-name">message</span></span>)
+      <span class="name ">Oops</span>(<wbr><span class="parameter" id="-param-message"><span class="type-annotation">String</span> <span class="parameter-name">message</span></span>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass-class.html b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
index aa292e5b5b..c37e9ba707 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass-class.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/OperatorReferenceClass/OperatorReferenceClass.html b/testing/test_package_docs/fake/OperatorReferenceClass/OperatorReferenceClass.html
index 10bace02ed..f3e16d0563 100644
--- a/testing/test_package_docs/fake/OperatorReferenceClass/OperatorReferenceClass.html
+++ b/testing/test_package_docs/fake/OperatorReferenceClass/OperatorReferenceClass.html
@@ -63,7 +63,7 @@ <h5>class OperatorReferenceClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">OperatorReferenceClass</span>(<wbr>)
+      <span class="name ">OperatorReferenceClass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/OtherGenericsThing-class.html b/testing/test_package_docs/fake/OtherGenericsThing-class.html
index 87d23c8a29..016c19c5ee 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing-class.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html b/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
index c1ce53b197..51bb230ee5 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/OtherGenericsThing.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing&lt;A&gt;</a></li>
     <li class="self-crumb">constructor OtherGenericsThing</li>
   </ol>
   <div class="self-name">OtherGenericsThing</div>
@@ -64,7 +64,7 @@ <h5>class OtherGenericsThing</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">OtherGenericsThing</span>(<wbr>)
+      <span class="name ">OtherGenericsThing&lt;A&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/convert.html b/testing/test_package_docs/fake/OtherGenericsThing/convert.html
index 211ad8b872..3cb965253e 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/convert.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/convert.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing&lt;A&gt;</a></li>
     <li class="self-crumb">method convert</li>
   </ol>
   <div class="self-name">convert</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html b/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
index b680751dc2..9f50531de1 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing&lt;A&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html b/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
index 4ee3eaad3c..269d087bc2 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing&lt;A&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html b/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
index 33298a860d..69e0fbe90d 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing&lt;A&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html b/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
index f06fbc0f4a..483e8eb825 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing&lt;A&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/OtherGenericsThing/toString.html b/testing/test_package_docs/fake/OtherGenericsThing/toString.html
index 902e2bc896..fb8136da38 100644
--- a/testing/test_package_docs/fake/OtherGenericsThing/toString.html
+++ b/testing/test_package_docs/fake/OtherGenericsThing/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing</a></li>
+    <li><a href="fake/OtherGenericsThing-class.html">OtherGenericsThing&lt;A&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/PI-constant.html b/testing/test_package_docs/fake/PI-constant.html
index 65ab36f301..8f81997c0d 100644
--- a/testing/test_package_docs/fake/PI-constant.html
+++ b/testing/test_package_docs/fake/PI-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList-class.html b/testing/test_package_docs/fake/SpecialList-class.html
index e38934d9f0..94e6f8da01 100644
--- a/testing/test_package_docs/fake/SpecialList-class.html
+++ b/testing/test_package_docs/fake/SpecialList-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/SpecialList/SpecialList.html b/testing/test_package_docs/fake/SpecialList/SpecialList.html
index e82ed3934e..60cb4c3653 100644
--- a/testing/test_package_docs/fake/SpecialList/SpecialList.html
+++ b/testing/test_package_docs/fake/SpecialList/SpecialList.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">constructor SpecialList</li>
   </ol>
   <div class="self-name">SpecialList</div>
@@ -115,7 +115,7 @@ <h5>class SpecialList</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">SpecialList</span>(<wbr>)
+      <span class="name ">SpecialList&lt;E&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/SpecialList/add.html b/testing/test_package_docs/fake/SpecialList/add.html
index 483b247b51..1244a442d4 100644
--- a/testing/test_package_docs/fake/SpecialList/add.html
+++ b/testing/test_package_docs/fake/SpecialList/add.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method add</li>
   </ol>
   <div class="self-name">add</div>
diff --git a/testing/test_package_docs/fake/SpecialList/addAll.html b/testing/test_package_docs/fake/SpecialList/addAll.html
index 9dee7fa885..98d281ca1b 100644
--- a/testing/test_package_docs/fake/SpecialList/addAll.html
+++ b/testing/test_package_docs/fake/SpecialList/addAll.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method addAll</li>
   </ol>
   <div class="self-name">addAll</div>
diff --git a/testing/test_package_docs/fake/SpecialList/any.html b/testing/test_package_docs/fake/SpecialList/any.html
index 3f196ed872..d1bf40a0c3 100644
--- a/testing/test_package_docs/fake/SpecialList/any.html
+++ b/testing/test_package_docs/fake/SpecialList/any.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method any</li>
   </ol>
   <div class="self-name">any</div>
diff --git a/testing/test_package_docs/fake/SpecialList/asMap.html b/testing/test_package_docs/fake/SpecialList/asMap.html
index 0ead4fa6ab..61e9676517 100644
--- a/testing/test_package_docs/fake/SpecialList/asMap.html
+++ b/testing/test_package_docs/fake/SpecialList/asMap.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method asMap</li>
   </ol>
   <div class="self-name">asMap</div>
diff --git a/testing/test_package_docs/fake/SpecialList/clear.html b/testing/test_package_docs/fake/SpecialList/clear.html
index 86893a5843..ec3f85cf6d 100644
--- a/testing/test_package_docs/fake/SpecialList/clear.html
+++ b/testing/test_package_docs/fake/SpecialList/clear.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method clear</li>
   </ol>
   <div class="self-name">clear</div>
diff --git a/testing/test_package_docs/fake/SpecialList/contains.html b/testing/test_package_docs/fake/SpecialList/contains.html
index ca6e702b28..850e8999ad 100644
--- a/testing/test_package_docs/fake/SpecialList/contains.html
+++ b/testing/test_package_docs/fake/SpecialList/contains.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method contains</li>
   </ol>
   <div class="self-name">contains</div>
diff --git a/testing/test_package_docs/fake/SpecialList/elementAt.html b/testing/test_package_docs/fake/SpecialList/elementAt.html
index fba8e79986..05daf09ab3 100644
--- a/testing/test_package_docs/fake/SpecialList/elementAt.html
+++ b/testing/test_package_docs/fake/SpecialList/elementAt.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method elementAt</li>
   </ol>
   <div class="self-name">elementAt</div>
diff --git a/testing/test_package_docs/fake/SpecialList/every.html b/testing/test_package_docs/fake/SpecialList/every.html
index 16c42cf74a..d7dc2f35ea 100644
--- a/testing/test_package_docs/fake/SpecialList/every.html
+++ b/testing/test_package_docs/fake/SpecialList/every.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method every</li>
   </ol>
   <div class="self-name">every</div>
diff --git a/testing/test_package_docs/fake/SpecialList/expand.html b/testing/test_package_docs/fake/SpecialList/expand.html
index 3844bf14b4..88a4f964cd 100644
--- a/testing/test_package_docs/fake/SpecialList/expand.html
+++ b/testing/test_package_docs/fake/SpecialList/expand.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method expand&lt;T&gt;</li>
   </ol>
   <div class="self-name">expand</div>
diff --git a/testing/test_package_docs/fake/SpecialList/fillRange.html b/testing/test_package_docs/fake/SpecialList/fillRange.html
index 44a4578172..485163f64a 100644
--- a/testing/test_package_docs/fake/SpecialList/fillRange.html
+++ b/testing/test_package_docs/fake/SpecialList/fillRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method fillRange</li>
   </ol>
   <div class="self-name">fillRange</div>
diff --git a/testing/test_package_docs/fake/SpecialList/first.html b/testing/test_package_docs/fake/SpecialList/first.html
index 22a8324768..8a1d11917b 100644
--- a/testing/test_package_docs/fake/SpecialList/first.html
+++ b/testing/test_package_docs/fake/SpecialList/first.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property first</li>
   </ol>
   <div class="self-name">first</div>
diff --git a/testing/test_package_docs/fake/SpecialList/firstWhere.html b/testing/test_package_docs/fake/SpecialList/firstWhere.html
index c5d16c5986..458381d9f3 100644
--- a/testing/test_package_docs/fake/SpecialList/firstWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/firstWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method firstWhere</li>
   </ol>
   <div class="self-name">firstWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/fold.html b/testing/test_package_docs/fake/SpecialList/fold.html
index 823cd5de8e..4b4f3425c8 100644
--- a/testing/test_package_docs/fake/SpecialList/fold.html
+++ b/testing/test_package_docs/fake/SpecialList/fold.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method fold&lt;T&gt;</li>
   </ol>
   <div class="self-name">fold</div>
diff --git a/testing/test_package_docs/fake/SpecialList/forEach.html b/testing/test_package_docs/fake/SpecialList/forEach.html
index 7d45e1609c..81f7954650 100644
--- a/testing/test_package_docs/fake/SpecialList/forEach.html
+++ b/testing/test_package_docs/fake/SpecialList/forEach.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method forEach</li>
   </ol>
   <div class="self-name">forEach</div>
diff --git a/testing/test_package_docs/fake/SpecialList/getRange.html b/testing/test_package_docs/fake/SpecialList/getRange.html
index dbb6918cb9..bb9475b911 100644
--- a/testing/test_package_docs/fake/SpecialList/getRange.html
+++ b/testing/test_package_docs/fake/SpecialList/getRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method getRange</li>
   </ol>
   <div class="self-name">getRange</div>
diff --git a/testing/test_package_docs/fake/SpecialList/hashCode.html b/testing/test_package_docs/fake/SpecialList/hashCode.html
index 73dc9a3c04..909d80bc71 100644
--- a/testing/test_package_docs/fake/SpecialList/hashCode.html
+++ b/testing/test_package_docs/fake/SpecialList/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/fake/SpecialList/indexOf.html b/testing/test_package_docs/fake/SpecialList/indexOf.html
index 385ca212bd..3e66337c7e 100644
--- a/testing/test_package_docs/fake/SpecialList/indexOf.html
+++ b/testing/test_package_docs/fake/SpecialList/indexOf.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method indexOf</li>
   </ol>
   <div class="self-name">indexOf</div>
diff --git a/testing/test_package_docs/fake/SpecialList/insert.html b/testing/test_package_docs/fake/SpecialList/insert.html
index daf34e18c2..cf35c08392 100644
--- a/testing/test_package_docs/fake/SpecialList/insert.html
+++ b/testing/test_package_docs/fake/SpecialList/insert.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method insert</li>
   </ol>
   <div class="self-name">insert</div>
diff --git a/testing/test_package_docs/fake/SpecialList/insertAll.html b/testing/test_package_docs/fake/SpecialList/insertAll.html
index e654fe1ca6..73cc041880 100644
--- a/testing/test_package_docs/fake/SpecialList/insertAll.html
+++ b/testing/test_package_docs/fake/SpecialList/insertAll.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method insertAll</li>
   </ol>
   <div class="self-name">insertAll</div>
diff --git a/testing/test_package_docs/fake/SpecialList/isEmpty.html b/testing/test_package_docs/fake/SpecialList/isEmpty.html
index fae4dd8157..d3d6345130 100644
--- a/testing/test_package_docs/fake/SpecialList/isEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isEmpty.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property isEmpty</li>
   </ol>
   <div class="self-name">isEmpty</div>
diff --git a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
index c072c0aa30..e9a60d66dd 100644
--- a/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
+++ b/testing/test_package_docs/fake/SpecialList/isNotEmpty.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property isNotEmpty</li>
   </ol>
   <div class="self-name">isNotEmpty</div>
diff --git a/testing/test_package_docs/fake/SpecialList/iterator.html b/testing/test_package_docs/fake/SpecialList/iterator.html
index a04505a4ea..6b054b6f2a 100644
--- a/testing/test_package_docs/fake/SpecialList/iterator.html
+++ b/testing/test_package_docs/fake/SpecialList/iterator.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property iterator</li>
   </ol>
   <div class="self-name">iterator</div>
diff --git a/testing/test_package_docs/fake/SpecialList/join.html b/testing/test_package_docs/fake/SpecialList/join.html
index 297560732b..702b7aa344 100644
--- a/testing/test_package_docs/fake/SpecialList/join.html
+++ b/testing/test_package_docs/fake/SpecialList/join.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method join</li>
   </ol>
   <div class="self-name">join</div>
diff --git a/testing/test_package_docs/fake/SpecialList/last.html b/testing/test_package_docs/fake/SpecialList/last.html
index ed97f26b72..f27e7f3ec3 100644
--- a/testing/test_package_docs/fake/SpecialList/last.html
+++ b/testing/test_package_docs/fake/SpecialList/last.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property last</li>
   </ol>
   <div class="self-name">last</div>
diff --git a/testing/test_package_docs/fake/SpecialList/lastIndexOf.html b/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
index 8cced4e0ca..c0c32874a0 100644
--- a/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
+++ b/testing/test_package_docs/fake/SpecialList/lastIndexOf.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method lastIndexOf</li>
   </ol>
   <div class="self-name">lastIndexOf</div>
diff --git a/testing/test_package_docs/fake/SpecialList/lastWhere.html b/testing/test_package_docs/fake/SpecialList/lastWhere.html
index aaac5aa231..cd259c5e06 100644
--- a/testing/test_package_docs/fake/SpecialList/lastWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/lastWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method lastWhere</li>
   </ol>
   <div class="self-name">lastWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/length.html b/testing/test_package_docs/fake/SpecialList/length.html
index 7340aa1019..c987b4563a 100644
--- a/testing/test_package_docs/fake/SpecialList/length.html
+++ b/testing/test_package_docs/fake/SpecialList/length.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property length</li>
   </ol>
   <div class="self-name">length</div>
diff --git a/testing/test_package_docs/fake/SpecialList/map.html b/testing/test_package_docs/fake/SpecialList/map.html
index dfe530b5b1..c91b5c105c 100644
--- a/testing/test_package_docs/fake/SpecialList/map.html
+++ b/testing/test_package_docs/fake/SpecialList/map.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method map&lt;T&gt;</li>
   </ol>
   <div class="self-name">map</div>
diff --git a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
index 9ac96c3a2d..4e1f88b2e9 100644
--- a/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
+++ b/testing/test_package_docs/fake/SpecialList/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_equals.html b/testing/test_package_docs/fake/SpecialList/operator_equals.html
index 6889c7213f..842003a4c7 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_equals.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_get.html b/testing/test_package_docs/fake/SpecialList/operator_get.html
index bccbd6a6e4..0d13c2c0b5 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_get.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_get.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method operator []</li>
   </ol>
   <div class="self-name">operator []</div>
diff --git a/testing/test_package_docs/fake/SpecialList/operator_put.html b/testing/test_package_docs/fake/SpecialList/operator_put.html
index 33f46d83cd..9e588d16a2 100644
--- a/testing/test_package_docs/fake/SpecialList/operator_put.html
+++ b/testing/test_package_docs/fake/SpecialList/operator_put.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method operator []=</li>
   </ol>
   <div class="self-name">operator []=</div>
diff --git a/testing/test_package_docs/fake/SpecialList/reduce.html b/testing/test_package_docs/fake/SpecialList/reduce.html
index b9eaa9229a..d1b2b48daa 100644
--- a/testing/test_package_docs/fake/SpecialList/reduce.html
+++ b/testing/test_package_docs/fake/SpecialList/reduce.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method reduce</li>
   </ol>
   <div class="self-name">reduce</div>
diff --git a/testing/test_package_docs/fake/SpecialList/remove.html b/testing/test_package_docs/fake/SpecialList/remove.html
index 8a17e8ae92..30e0c2f560 100644
--- a/testing/test_package_docs/fake/SpecialList/remove.html
+++ b/testing/test_package_docs/fake/SpecialList/remove.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method remove</li>
   </ol>
   <div class="self-name">remove</div>
diff --git a/testing/test_package_docs/fake/SpecialList/removeAt.html b/testing/test_package_docs/fake/SpecialList/removeAt.html
index 08c379e2b7..a057461167 100644
--- a/testing/test_package_docs/fake/SpecialList/removeAt.html
+++ b/testing/test_package_docs/fake/SpecialList/removeAt.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method removeAt</li>
   </ol>
   <div class="self-name">removeAt</div>
diff --git a/testing/test_package_docs/fake/SpecialList/removeLast.html b/testing/test_package_docs/fake/SpecialList/removeLast.html
index 626daa0f55..98931a0c6d 100644
--- a/testing/test_package_docs/fake/SpecialList/removeLast.html
+++ b/testing/test_package_docs/fake/SpecialList/removeLast.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method removeLast</li>
   </ol>
   <div class="self-name">removeLast</div>
diff --git a/testing/test_package_docs/fake/SpecialList/removeRange.html b/testing/test_package_docs/fake/SpecialList/removeRange.html
index c458b3d7d4..25a9e075ed 100644
--- a/testing/test_package_docs/fake/SpecialList/removeRange.html
+++ b/testing/test_package_docs/fake/SpecialList/removeRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method removeRange</li>
   </ol>
   <div class="self-name">removeRange</div>
diff --git a/testing/test_package_docs/fake/SpecialList/removeWhere.html b/testing/test_package_docs/fake/SpecialList/removeWhere.html
index 3709ac85e7..4c4831e569 100644
--- a/testing/test_package_docs/fake/SpecialList/removeWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/removeWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method removeWhere</li>
   </ol>
   <div class="self-name">removeWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/replaceRange.html b/testing/test_package_docs/fake/SpecialList/replaceRange.html
index ddb1669217..635eb5bedb 100644
--- a/testing/test_package_docs/fake/SpecialList/replaceRange.html
+++ b/testing/test_package_docs/fake/SpecialList/replaceRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method replaceRange</li>
   </ol>
   <div class="self-name">replaceRange</div>
diff --git a/testing/test_package_docs/fake/SpecialList/retainWhere.html b/testing/test_package_docs/fake/SpecialList/retainWhere.html
index b39a7df214..7b86a2813e 100644
--- a/testing/test_package_docs/fake/SpecialList/retainWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/retainWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method retainWhere</li>
   </ol>
   <div class="self-name">retainWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/reversed.html b/testing/test_package_docs/fake/SpecialList/reversed.html
index 89dddf0c9b..8b03c643f0 100644
--- a/testing/test_package_docs/fake/SpecialList/reversed.html
+++ b/testing/test_package_docs/fake/SpecialList/reversed.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property reversed</li>
   </ol>
   <div class="self-name">reversed</div>
diff --git a/testing/test_package_docs/fake/SpecialList/runtimeType.html b/testing/test_package_docs/fake/SpecialList/runtimeType.html
index b78cbd79d8..d29593f558 100644
--- a/testing/test_package_docs/fake/SpecialList/runtimeType.html
+++ b/testing/test_package_docs/fake/SpecialList/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/fake/SpecialList/setAll.html b/testing/test_package_docs/fake/SpecialList/setAll.html
index 31ba32f763..82fc91eebf 100644
--- a/testing/test_package_docs/fake/SpecialList/setAll.html
+++ b/testing/test_package_docs/fake/SpecialList/setAll.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method setAll</li>
   </ol>
   <div class="self-name">setAll</div>
diff --git a/testing/test_package_docs/fake/SpecialList/setRange.html b/testing/test_package_docs/fake/SpecialList/setRange.html
index 4610fcbc7e..4b40d289b3 100644
--- a/testing/test_package_docs/fake/SpecialList/setRange.html
+++ b/testing/test_package_docs/fake/SpecialList/setRange.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method setRange</li>
   </ol>
   <div class="self-name">setRange</div>
diff --git a/testing/test_package_docs/fake/SpecialList/shuffle.html b/testing/test_package_docs/fake/SpecialList/shuffle.html
index 80360a0b35..2d459f93db 100644
--- a/testing/test_package_docs/fake/SpecialList/shuffle.html
+++ b/testing/test_package_docs/fake/SpecialList/shuffle.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method shuffle</li>
   </ol>
   <div class="self-name">shuffle</div>
diff --git a/testing/test_package_docs/fake/SpecialList/single.html b/testing/test_package_docs/fake/SpecialList/single.html
index d8f3451044..5fd3169f49 100644
--- a/testing/test_package_docs/fake/SpecialList/single.html
+++ b/testing/test_package_docs/fake/SpecialList/single.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">property single</li>
   </ol>
   <div class="self-name">single</div>
diff --git a/testing/test_package_docs/fake/SpecialList/singleWhere.html b/testing/test_package_docs/fake/SpecialList/singleWhere.html
index 591978c677..8a80905cd0 100644
--- a/testing/test_package_docs/fake/SpecialList/singleWhere.html
+++ b/testing/test_package_docs/fake/SpecialList/singleWhere.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method singleWhere</li>
   </ol>
   <div class="self-name">singleWhere</div>
diff --git a/testing/test_package_docs/fake/SpecialList/skip.html b/testing/test_package_docs/fake/SpecialList/skip.html
index 9509f7d455..7833728644 100644
--- a/testing/test_package_docs/fake/SpecialList/skip.html
+++ b/testing/test_package_docs/fake/SpecialList/skip.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method skip</li>
   </ol>
   <div class="self-name">skip</div>
diff --git a/testing/test_package_docs/fake/SpecialList/skipWhile.html b/testing/test_package_docs/fake/SpecialList/skipWhile.html
index ee7f3dad9a..d67a41905b 100644
--- a/testing/test_package_docs/fake/SpecialList/skipWhile.html
+++ b/testing/test_package_docs/fake/SpecialList/skipWhile.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method skipWhile</li>
   </ol>
   <div class="self-name">skipWhile</div>
diff --git a/testing/test_package_docs/fake/SpecialList/sort.html b/testing/test_package_docs/fake/SpecialList/sort.html
index 66fb7f89a4..8beab20ee6 100644
--- a/testing/test_package_docs/fake/SpecialList/sort.html
+++ b/testing/test_package_docs/fake/SpecialList/sort.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method sort</li>
   </ol>
   <div class="self-name">sort</div>
diff --git a/testing/test_package_docs/fake/SpecialList/sublist.html b/testing/test_package_docs/fake/SpecialList/sublist.html
index 9280e37412..eeb7fdbdbf 100644
--- a/testing/test_package_docs/fake/SpecialList/sublist.html
+++ b/testing/test_package_docs/fake/SpecialList/sublist.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method sublist</li>
   </ol>
   <div class="self-name">sublist</div>
diff --git a/testing/test_package_docs/fake/SpecialList/take.html b/testing/test_package_docs/fake/SpecialList/take.html
index 890b185f24..db64984d94 100644
--- a/testing/test_package_docs/fake/SpecialList/take.html
+++ b/testing/test_package_docs/fake/SpecialList/take.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method take</li>
   </ol>
   <div class="self-name">take</div>
diff --git a/testing/test_package_docs/fake/SpecialList/takeWhile.html b/testing/test_package_docs/fake/SpecialList/takeWhile.html
index a6dd0dacff..73fe82b5d4 100644
--- a/testing/test_package_docs/fake/SpecialList/takeWhile.html
+++ b/testing/test_package_docs/fake/SpecialList/takeWhile.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method takeWhile</li>
   </ol>
   <div class="self-name">takeWhile</div>
diff --git a/testing/test_package_docs/fake/SpecialList/toList.html b/testing/test_package_docs/fake/SpecialList/toList.html
index 100c5f75b1..c99a441901 100644
--- a/testing/test_package_docs/fake/SpecialList/toList.html
+++ b/testing/test_package_docs/fake/SpecialList/toList.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method toList</li>
   </ol>
   <div class="self-name">toList</div>
diff --git a/testing/test_package_docs/fake/SpecialList/toSet.html b/testing/test_package_docs/fake/SpecialList/toSet.html
index 985daca7e5..24d7c0074e 100644
--- a/testing/test_package_docs/fake/SpecialList/toSet.html
+++ b/testing/test_package_docs/fake/SpecialList/toSet.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method toSet</li>
   </ol>
   <div class="self-name">toSet</div>
diff --git a/testing/test_package_docs/fake/SpecialList/toString.html b/testing/test_package_docs/fake/SpecialList/toString.html
index 6c53430515..49f9e14134 100644
--- a/testing/test_package_docs/fake/SpecialList/toString.html
+++ b/testing/test_package_docs/fake/SpecialList/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/fake/SpecialList/where.html b/testing/test_package_docs/fake/SpecialList/where.html
index f3c90976a2..4006a969d2 100644
--- a/testing/test_package_docs/fake/SpecialList/where.html
+++ b/testing/test_package_docs/fake/SpecialList/where.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="fake/fake-library.html">fake</a></li>
-    <li><a href="fake/SpecialList-class.html">SpecialList</a></li>
+    <li><a href="fake/SpecialList-class.html">SpecialList&lt;E&gt;</a></li>
     <li class="self-crumb">method where</li>
   </ol>
   <div class="self-name">where</div>
diff --git a/testing/test_package_docs/fake/SubForDocComments-class.html b/testing/test_package_docs/fake/SubForDocComments-class.html
index be648cf212..17664e8ba6 100644
--- a/testing/test_package_docs/fake/SubForDocComments-class.html
+++ b/testing/test_package_docs/fake/SubForDocComments-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/SubForDocComments/SubForDocComments.html b/testing/test_package_docs/fake/SubForDocComments/SubForDocComments.html
index 0a0b98a7ad..a3589a1d93 100644
--- a/testing/test_package_docs/fake/SubForDocComments/SubForDocComments.html
+++ b/testing/test_package_docs/fake/SubForDocComments/SubForDocComments.html
@@ -66,7 +66,7 @@ <h5>class SubForDocComments</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">SubForDocComments</span>(<wbr>)
+      <span class="name ">SubForDocComments</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass-class.html b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
index 2fef872613..f69aa393f1 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass-class.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/SuperAwesomeClass/SuperAwesomeClass.html b/testing/test_package_docs/fake/SuperAwesomeClass/SuperAwesomeClass.html
index 8c0b1b4f4c..4f20c604e8 100644
--- a/testing/test_package_docs/fake/SuperAwesomeClass/SuperAwesomeClass.html
+++ b/testing/test_package_docs/fake/SuperAwesomeClass/SuperAwesomeClass.html
@@ -66,7 +66,7 @@ <h5>class SuperAwesomeClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">SuperAwesomeClass</span>(<wbr>)
+      <span class="name ">SuperAwesomeClass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/UP-constant.html b/testing/test_package_docs/fake/UP-constant.html
index 4f2fef8cfb..d272b81b65 100644
--- a/testing/test_package_docs/fake/UP-constant.html
+++ b/testing/test_package_docs/fake/UP-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/VoidCallback.html b/testing/test_package_docs/fake/VoidCallback.html
index bdf07e43f9..6bf39ebe0a 100644
--- a/testing/test_package_docs/fake/VoidCallback.html
+++ b/testing/test_package_docs/fake/VoidCallback.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter-class.html b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
index 39f9a79c8a..558edc7c08 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter-class.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter-class.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/WithGetterAndSetter/WithGetterAndSetter.html b/testing/test_package_docs/fake/WithGetterAndSetter/WithGetterAndSetter.html
index fa76933736..67f6e57b30 100644
--- a/testing/test_package_docs/fake/WithGetterAndSetter/WithGetterAndSetter.html
+++ b/testing/test_package_docs/fake/WithGetterAndSetter/WithGetterAndSetter.html
@@ -64,7 +64,7 @@ <h5>class WithGetterAndSetter</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">WithGetterAndSetter</span>(<wbr>)
+      <span class="name ">WithGetterAndSetter</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/fake/ZERO-constant.html b/testing/test_package_docs/fake/ZERO-constant.html
index 91aee599ec..106ed2badb 100644
--- a/testing/test_package_docs/fake/ZERO-constant.html
+++ b/testing/test_package_docs/fake/ZERO-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/addCallback.html b/testing/test_package_docs/fake/addCallback.html
index 302d11d648..e1a73fc8b3 100644
--- a/testing/test_package_docs/fake/addCallback.html
+++ b/testing/test_package_docs/fake/addCallback.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/addCallback2.html b/testing/test_package_docs/fake/addCallback2.html
index a8b49546d5..fd59fce1b0 100644
--- a/testing/test_package_docs/fake/addCallback2.html
+++ b/testing/test_package_docs/fake/addCallback2.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/dynamicGetter.html b/testing/test_package_docs/fake/dynamicGetter.html
index 4e253978b0..437f1bb049 100644
--- a/testing/test_package_docs/fake/dynamicGetter.html
+++ b/testing/test_package_docs/fake/dynamicGetter.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html
index 45e9fdf057..2a0934a13b 100644
--- a/testing/test_package_docs/fake/fake-library.html
+++ b/testing/test_package_docs/fake/fake-library.html
@@ -135,6 +135,12 @@ <h2>Classes</h2>
         </dt>
         <dd>
           For make-better testing of constants. <a href="fake/ConstantClass-class.html">[...]</a>
+        </dd>
+        <dt id="ConstructorTester">
+          <span class="name "><a href="fake/ConstructorTester-class.html">ConstructorTester</a></span>
+        </dt>
+        <dd>
+          
         </dd>
         <dt id="Cool">
           <span class="name "><a href="fake/Cool-class.html">Cool</a></span>
@@ -710,6 +716,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/functionWithFunctionParameters.html b/testing/test_package_docs/fake/functionWithFunctionParameters.html
index 937863908e..1e72e62679 100644
--- a/testing/test_package_docs/fake/functionWithFunctionParameters.html
+++ b/testing/test_package_docs/fake/functionWithFunctionParameters.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/getterSetterNodocGetter.html b/testing/test_package_docs/fake/getterSetterNodocGetter.html
index a5809e09c3..76fa5fd15f 100644
--- a/testing/test_package_docs/fake/getterSetterNodocGetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocGetter.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/getterSetterNodocSetter.html b/testing/test_package_docs/fake/getterSetterNodocSetter.html
index b21b62638c..c7189665e7 100644
--- a/testing/test_package_docs/fake/getterSetterNodocSetter.html
+++ b/testing/test_package_docs/fake/getterSetterNodocSetter.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/greatAnnotation-constant.html b/testing/test_package_docs/fake/greatAnnotation-constant.html
index b1a8c4d64b..c60b63c4fb 100644
--- a/testing/test_package_docs/fake/greatAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatAnnotation-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/greatestAnnotation-constant.html b/testing/test_package_docs/fake/greatestAnnotation-constant.html
index 4480a79643..34acf3b70b 100644
--- a/testing/test_package_docs/fake/greatestAnnotation-constant.html
+++ b/testing/test_package_docs/fake/greatestAnnotation-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/incorrectDocReference-constant.html b/testing/test_package_docs/fake/incorrectDocReference-constant.html
index 936bcd18d1..bb4d107728 100644
--- a/testing/test_package_docs/fake/incorrectDocReference-constant.html
+++ b/testing/test_package_docs/fake/incorrectDocReference-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/justGetter.html b/testing/test_package_docs/fake/justGetter.html
index 0e7c2c23eb..9ca91f08b6 100644
--- a/testing/test_package_docs/fake/justGetter.html
+++ b/testing/test_package_docs/fake/justGetter.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/justSetter.html b/testing/test_package_docs/fake/justSetter.html
index 5e63703031..e5a6f594fb 100644
--- a/testing/test_package_docs/fake/justSetter.html
+++ b/testing/test_package_docs/fake/justSetter.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/mapWithDynamicKeys.html b/testing/test_package_docs/fake/mapWithDynamicKeys.html
index c38c5254ab..33991cf184 100644
--- a/testing/test_package_docs/fake/mapWithDynamicKeys.html
+++ b/testing/test_package_docs/fake/mapWithDynamicKeys.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/meaningOfLife.html b/testing/test_package_docs/fake/meaningOfLife.html
index 666651005b..183da664f7 100644
--- a/testing/test_package_docs/fake/meaningOfLife.html
+++ b/testing/test_package_docs/fake/meaningOfLife.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/myCoolTypedef.html b/testing/test_package_docs/fake/myCoolTypedef.html
index a9509a0be5..0c6f575568 100644
--- a/testing/test_package_docs/fake/myCoolTypedef.html
+++ b/testing/test_package_docs/fake/myCoolTypedef.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/myGenericFunction.html b/testing/test_package_docs/fake/myGenericFunction.html
index d2d9eb10d1..3d785d3104 100644
--- a/testing/test_package_docs/fake/myGenericFunction.html
+++ b/testing/test_package_docs/fake/myGenericFunction.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
index ba8f0e2c3a..ae3b840f31 100644
--- a/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
+++ b/testing/test_package_docs/fake/onlyPositionalWithNoDefaultNoType.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/paintImage1.html b/testing/test_package_docs/fake/paintImage1.html
index 0dd6bf8bdb..ec06335406 100644
--- a/testing/test_package_docs/fake/paintImage1.html
+++ b/testing/test_package_docs/fake/paintImage1.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/paintImage2.html b/testing/test_package_docs/fake/paintImage2.html
index 67d0f33090..d357064c35 100644
--- a/testing/test_package_docs/fake/paintImage2.html
+++ b/testing/test_package_docs/fake/paintImage2.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/paramFromAnotherLib.html b/testing/test_package_docs/fake/paramFromAnotherLib.html
index 0287a3f73c..02ca879745 100644
--- a/testing/test_package_docs/fake/paramFromAnotherLib.html
+++ b/testing/test_package_docs/fake/paramFromAnotherLib.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/required-constant.html b/testing/test_package_docs/fake/required-constant.html
index 25e8a7711a..7d65ff613a 100644
--- a/testing/test_package_docs/fake/required-constant.html
+++ b/testing/test_package_docs/fake/required-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/setAndGet.html b/testing/test_package_docs/fake/setAndGet.html
index f6d644eeb1..c2201b5af5 100644
--- a/testing/test_package_docs/fake/setAndGet.html
+++ b/testing/test_package_docs/fake/setAndGet.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/short.html b/testing/test_package_docs/fake/short.html
index 0222e76f70..f1584d7e4f 100644
--- a/testing/test_package_docs/fake/short.html
+++ b/testing/test_package_docs/fake/short.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/simpleProperty.html b/testing/test_package_docs/fake/simpleProperty.html
index d6ca7ba1c0..733f922977 100644
--- a/testing/test_package_docs/fake/simpleProperty.html
+++ b/testing/test_package_docs/fake/simpleProperty.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/soIntense.html b/testing/test_package_docs/fake/soIntense.html
index 06679f3343..a58d2b735b 100644
--- a/testing/test_package_docs/fake/soIntense.html
+++ b/testing/test_package_docs/fake/soIntense.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
index 16ea9ce107..bf4b81a352 100644
--- a/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
+++ b/testing/test_package_docs/fake/testingCodeSyntaxInOneLiners-constant.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/thisIsAlsoAsync.html b/testing/test_package_docs/fake/thisIsAlsoAsync.html
index e8700a4854..7aeda63a04 100644
--- a/testing/test_package_docs/fake/thisIsAlsoAsync.html
+++ b/testing/test_package_docs/fake/thisIsAlsoAsync.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/thisIsAsync.html b/testing/test_package_docs/fake/thisIsAsync.html
index 7cd2414433..1e6b3d8692 100644
--- a/testing/test_package_docs/fake/thisIsAsync.html
+++ b/testing/test_package_docs/fake/thisIsAsync.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/fake/topLevelFunction.html b/testing/test_package_docs/fake/topLevelFunction.html
index a2c2e71740..74c72ec5be 100644
--- a/testing/test_package_docs/fake/topLevelFunction.html
+++ b/testing/test_package_docs/fake/topLevelFunction.html
@@ -48,6 +48,7 @@ <h5>library fake</h5>
       <li><a href="fake/BaseThingy2-class.html">BaseThingy2</a></li>
       <li><a href="fake/ClassWithUnusualProperties-class.html">ClassWithUnusualProperties</a></li>
       <li><a href="fake/ConstantClass-class.html">ConstantClass</a></li>
+      <li><a href="fake/ConstructorTester-class.html">ConstructorTester</a></li>
       <li><a href="fake/Cool-class.html">Cool</a></li>
       <li><a href="fake/ExtraSpecialList-class.html">ExtraSpecialList</a></li>
       <li><a href="fake/Foo2-class.html">Foo2</a></li>
diff --git a/testing/test_package_docs/index.json b/testing/test_package_docs/index.json
index b7d684b86b..e177de151f 100644
--- a/testing/test_package_docs/index.json
+++ b/testing/test_package_docs/index.json
@@ -4364,6 +4364,94 @@
    "type": "class"
   }
  },
+ {
+  "name": "ConstructorTester",
+  "qualifiedName": "fake.ConstructorTester",
+  "href": "fake/ConstructorTester-class.html",
+  "type": "class",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "fake",
+   "type": "library"
+  }
+ },
+ {
+  "name": "ConstructorTester",
+  "qualifiedName": "fake.ConstructorTester",
+  "href": "fake/ConstructorTester/ConstructorTester.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ConstructorTester",
+   "type": "class"
+  }
+ },
+ {
+  "name": "operator ==",
+  "qualifiedName": "fake.ConstructorTester.==",
+  "href": "fake/ConstructorTester/operator_equals.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ConstructorTester",
+   "type": "class"
+  }
+ },
+ {
+  "name": "ConstructorTester.fromSomething",
+  "qualifiedName": "fake.ConstructorTester.fromSomething",
+  "href": "fake/ConstructorTester/ConstructorTester.fromSomething.html",
+  "type": "constructor",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ConstructorTester",
+   "type": "class"
+  }
+ },
+ {
+  "name": "hashCode",
+  "qualifiedName": "fake.ConstructorTester.hashCode",
+  "href": "fake/ConstructorTester/hashCode.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ConstructorTester",
+   "type": "class"
+  }
+ },
+ {
+  "name": "noSuchMethod",
+  "qualifiedName": "fake.ConstructorTester.noSuchMethod",
+  "href": "fake/ConstructorTester/noSuchMethod.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ConstructorTester",
+   "type": "class"
+  }
+ },
+ {
+  "name": "runtimeType",
+  "qualifiedName": "fake.ConstructorTester.runtimeType",
+  "href": "fake/ConstructorTester/runtimeType.html",
+  "type": "property",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ConstructorTester",
+   "type": "class"
+  }
+ },
+ {
+  "name": "toString",
+  "qualifiedName": "fake.ConstructorTester.toString",
+  "href": "fake/ConstructorTester/toString.html",
+  "type": "method",
+  "overriddenDepth": 0,
+  "enclosedBy": {
+   "name": "ConstructorTester",
+   "type": "class"
+  }
+ },
  {
   "name": "Cool",
   "qualifiedName": "fake.Cool",
diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html b/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html
index 8f59a2b055..deb43ba095 100644
--- a/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html
+++ b/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html
@@ -63,7 +63,7 @@ <h5>class SomeOtherClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">SomeOtherClass</span>(<wbr>)
+      <span class="name ">SomeOtherClass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html b/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html
index 0e7ec004cc..49f7c37666 100644
--- a/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html
+++ b/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html
@@ -63,7 +63,7 @@ <h5>class AUnicornClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">AUnicornClass</span>(<wbr>)
+      <span class="name ">AUnicornClass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html b/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html
index eb57ccb083..f1a7c198cb 100644
--- a/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html
+++ b/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html
@@ -63,7 +63,7 @@ <h5>class SomeClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">SomeClass</span>(<wbr>)
+      <span class="name ">SomeClass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html b/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html
index 068f6b75ca..5c6b91f087 100644
--- a/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html
+++ b/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html
@@ -63,7 +63,7 @@ <h5>class YetAnotherClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">YetAnotherClass</span>(<wbr>)
+      <span class="name ">YetAnotherClass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html b/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
index cb2ecbf7ea..5e29fd52ca 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/Whataclass.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass&lt;T&gt;</a></li>
     <li class="self-crumb">constructor Whataclass</li>
   </ol>
   <div class="self-name">Whataclass</div>
@@ -63,7 +63,7 @@ <h5>class Whataclass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Whataclass</span>(<wbr>)
+      <span class="name ">Whataclass&lt;T&gt;</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html b/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
index 6c99073808..2815c47ca7 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/hashCode.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass&lt;T&gt;</a></li>
     <li class="self-crumb">property hashCode</li>
   </ol>
   <div class="self-name">hashCode</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html b/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
index 1ae8229b44..ade2307c8b 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/noSuchMethod.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass&lt;T&gt;</a></li>
     <li class="self-crumb">method noSuchMethod</li>
   </ol>
   <div class="self-name">noSuchMethod</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html b/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
index 204ab85bcf..46cb692c11 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/operator_equals.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass&lt;T&gt;</a></li>
     <li class="self-crumb">method operator ==</li>
   </ol>
   <div class="self-name">operator ==</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html b/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
index 949ad24bd6..621568a202 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/runtimeType.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass&lt;T&gt;</a></li>
     <li class="self-crumb">property runtimeType</li>
   </ol>
   <div class="self-name">runtimeType</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html b/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
index 91597a8b40..f17990b731 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass/toString.html
@@ -25,7 +25,7 @@
   <ol class="breadcrumbs gt-separated dark hidden-xs">
     <li><a href="index.html">test_package</a></li>
     <li><a href="test_package_imported.main/test_package_imported.main-library.html">test_package_imported.main</a></li>
-    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass</a></li>
+    <li><a href="test_package_imported.main/Whataclass-class.html">Whataclass&lt;T&gt;</a></li>
     <li class="self-crumb">method toString</li>
   </ol>
   <div class="self-name">toString</div>
diff --git a/testing/test_package_docs/test_package_imported.main/Whataclass2/Whataclass2.html b/testing/test_package_docs/test_package_imported.main/Whataclass2/Whataclass2.html
index c9f1f14179..a0904680d1 100644
--- a/testing/test_package_docs/test_package_imported.main/Whataclass2/Whataclass2.html
+++ b/testing/test_package_docs/test_package_imported.main/Whataclass2/Whataclass2.html
@@ -63,7 +63,7 @@ <h5>class Whataclass2</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">Whataclass2</span>(<wbr>)
+      <span class="name ">Whataclass2</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/two_exports/BaseClass/BaseClass.html b/testing/test_package_docs/two_exports/BaseClass/BaseClass.html
index cd86de294c..3c976d3eb4 100644
--- a/testing/test_package_docs/two_exports/BaseClass/BaseClass.html
+++ b/testing/test_package_docs/two_exports/BaseClass/BaseClass.html
@@ -64,7 +64,7 @@ <h5>class BaseClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">BaseClass</span>(<wbr>)
+      <span class="name ">BaseClass</span>(<wbr>)
     </section>
 
     
diff --git a/testing/test_package_docs/two_exports/ExtendingClass/ExtendingClass.html b/testing/test_package_docs/two_exports/ExtendingClass/ExtendingClass.html
index 726bcbc0ec..c29c471144 100644
--- a/testing/test_package_docs/two_exports/ExtendingClass/ExtendingClass.html
+++ b/testing/test_package_docs/two_exports/ExtendingClass/ExtendingClass.html
@@ -64,7 +64,7 @@ <h5>class ExtendingClass</h5>
   <div class="col-xs-12 col-sm-9 col-md-8 main-content">
     <section class="multi-line-signature">
       
-            <span class="name ">ExtendingClass</span>(<wbr>)
+      <span class="name ">ExtendingClass</span>(<wbr>)
     </section>