diff --git a/README.md b/README.md
index f3ec3098..bc371341 100644
--- a/README.md
+++ b/README.md
@@ -54,11 +54,11 @@ Add the following lines to your `composer.json` file in order to add required pr
         {
             "type": "package",
             "package": {
-                "name": "citation-style-language/styles-distribution",
+                "name": "citation-style-language/styles",
                 "version":"1.0.0",
                 "source": {
                     "type": "git",
-                    "url": "https://github.com/citation-style-language/styles-distribution.git",
+                    "url": "https://github.com/citation-style-language/styles.git",
                     "reference": "master"
                 }
             }
@@ -66,7 +66,7 @@ Add the following lines to your `composer.json` file in order to add required pr
     ],
     "require": {
         "citation-style-language/locales":"@dev",
-        "citation-style-language/styles-distribution":"@dev",
+        "citation-style-language/styles":"@dev",
         "seboettg/citeproc-php": "^2"
     }
 }
diff --git a/composer.json b/composer.json
index fb4969ed..28696022 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
         {
             "name": "Sebastian Böttger",
             "email": "seboettg@gmail.com",
-            "homepage": "http://sebastianboettger.net",
+            "homepage": "https://sebastianboettger.net",
             "role": "Developer"
         }
     ],
@@ -23,7 +23,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Seboettg\\CiteProc\\": "tests/src/"
+            "Seboettg\\CiteProc\\Test\\": "tests/src/"
         }
     },
     "require": {
@@ -32,7 +32,8 @@
         "ext-simplexml": "*",
         "ext-json": "*",
         "php": ">=7.3",
-        "ext-mbstring": "*"
+        "ext-mbstring": "*",
+        "ext-intl": "*"
     },
     "require-dev": {
         "php-coveralls/php-coveralls": "^1",
@@ -41,18 +42,17 @@
         "phpmd/phpmd": "^2.8"
     },
     "suggest": {
-        "ext-intl": "*",
-        "symfony/polyfill-mbstring": "^1.10"
+      "symfony/polyfill-mbstring": "^1.10"
     },
     "scripts": {
         "post-install-cmd": [
-            "./install.sh styles-distribution",
+            "./install.sh styles",
             "./install.sh locales",
             "@compile-test-cases",
             "chmod +x vendor/bin/phpunit"
         ],
         "post-update-cmd": [
-            "./install.sh styles-distribution",
+            "./install.sh styles",
             "./install.sh locales",
             "@compile-test-cases",
             "chmod +x vendor/bin/phpunit"
diff --git a/src/Constraint/AbstractConstraint.php b/src/Constraint/AbstractConstraint.php
index a3fa3aba..e1246011 100644
--- a/src/Constraint/AbstractConstraint.php
+++ b/src/Constraint/AbstractConstraint.php
@@ -1,19 +1,16 @@
-<?php /** @noinspection PhpUnused */
+<?php
+declare(strict_types=1);
 /*
- * citeproc-php: AbstractConstraint.php
- * User: Sebastian Böttger <sebastian.boettger@thomascook.de>
- * created at 26.10.19, 14:12
+ * @link        http://github.com/seboettg/citeproc-php for the source repository
+ * @copyright   Copyright (c) 2019 Sebastian Böttger.
+ * @license     https://opensource.org/licenses/MIT
  */
 
 namespace Seboettg\CiteProc\Constraint;
 
+use Seboettg\Collection\ArrayList;
 use stdClass;
 
-/**
- * Class AbstractConstraint
- * @package Seboettg\CiteProc\Constraint
- * @noinspection PhpUnused
- */
 abstract class AbstractConstraint implements Constraint
 {
 
@@ -23,7 +20,7 @@ abstract class AbstractConstraint implements Constraint
     protected $match;
 
     /**
-     * @var array
+     * @var ArrayList\ArrayListInterface
      */
     protected $conditionVariables;
 
@@ -32,53 +29,70 @@ abstract class AbstractConstraint implements Constraint
      * @param stdClass $data;
      * @return bool
      */
-    abstract protected function matchForVariable($variable, $data);
+    abstract protected function matchForVariable(string $variable, stdClass $data): bool;
 
     /**
      * Variable constructor.
-     * @param string $value
+     * @param string $variableValues
      * @param string $match
      */
-    /** @noinspection PhpUnused */
-    public function __construct($value, $match = "any")
+    public function __construct(string $variableValues, string $match = "any")
     {
-        $this->conditionVariables = explode(" ", $value);
+        $this->conditionVariables = new ArrayList(...explode(" ", $variableValues));
         $this->match = $match;
     }
 
     /**
-     * @param $value
+     * @param stdClass $data
      * @param int|null $citationNumber
      * @return bool
      */
-    public function validate($value, $citationNumber = null)
+    public function validate(stdClass $data, int $citationNumber = null): bool
     {
         switch ($this->match) {
             case Constraint::MATCH_ALL:
-                return $this->matchAll($value);
+                return $this->matchAll($data);
             case Constraint::MATCH_NONE:
-                return !$this->matchAny($value); //no match for any value
+                return $this->matchNone($data); //no match for any value
             case Constraint::MATCH_ANY:
             default:
-                return $this->matchAny($value);
+                return $this->matchAny($data);
         }
     }
 
-    private function matchAny($value)
+    private function matchAny(stdClass $data): bool
     {
-        $conditionMatched = false;
-        foreach ($this->conditionVariables as $variable) {
-            $conditionMatched |= $this->matchForVariable($variable, $value);
-        }
-        return (bool)$conditionMatched;
+        return $this->conditionVariables
+            ->map(function (string $conditionVariable) use ($data) {
+                return $this->matchForVariable($conditionVariable, $data);
+            })
+            ->filter(function (bool $match) {
+                return $match === true;
+            })
+            ->count() > 0;
     }
 
-    private function matchAll($value)
+    private function matchAll(stdClass $data): bool
     {
-        $conditionMatched = true;
-        foreach ($this->conditionVariables as $variable) {
-            $conditionMatched &= $this->matchForVariable($variable, $value);
-        }
-        return (bool)$conditionMatched;
+        return $this->conditionVariables
+            ->map(function (string $conditionVariable) use ($data) {
+                return $this->matchForVariable($conditionVariable, $data);
+            })
+            ->filter(function (bool $match) {
+                return $match === true;
+            })
+            ->count() === $this->conditionVariables->count();
+    }
+
+    private function matchNone(stdClass $data): bool
+    {
+        return $this->conditionVariables
+            ->map(function (string $conditionVariable) use ($data) {
+                return $this->matchForVariable($conditionVariable, $data);
+            })
+            ->filter(function (bool $match) {
+                return $match === false;
+            })
+            ->count() === $this->conditionVariables->count();
     }
 }
diff --git a/src/Constraint/Constraint.php b/src/Constraint/Constraint.php
index 09ad72e3..bc9f3b02 100644
--- a/src/Constraint/Constraint.php
+++ b/src/Constraint/Constraint.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -9,6 +10,8 @@
 
 namespace Seboettg\CiteProc\Constraint;
 
+use stdClass;
+
 /**
  * Interface ConstraintInterface
  * @package Seboettg\CiteProc\Constraint
@@ -25,9 +28,9 @@ interface Constraint
     const MATCH_ALL = "all";
 
     /**
-     * @param $value
-     * @param null $citationNumber
+     * @param stdClass $data
+     * @param int|null $citationNumber
      * @return bool
      */
-    public function validate($value, $citationNumber = null);
+    public function validate(stdClass $data, int $citationNumber = null): bool;
 }
diff --git a/src/Constraint/Disambiguate.php b/src/Constraint/Disambiguate.php
index bc4b842f..31149835 100644
--- a/src/Constraint/Disambiguate.php
+++ b/src/Constraint/Disambiguate.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -9,27 +10,22 @@
 
 namespace Seboettg\CiteProc\Constraint;
 
+use stdClass;
+
 /**
  * Class Disambiguate
  * When set to “true” (the only allowed value), the element content is only rendered if it disambiguates two otherwise
  * identical citations. This attempt at disambiguation is only made when all other disambiguation methods have failed
  * to uniquely identify the target source.
- *
- * @package Seboettg\CiteProc\Constraint
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
- *
  */
-/** @noinspection PhpUnused */
 class Disambiguate implements Constraint
 {
     /**
-     * @codeCoverageIgnore
-     * @param $value
+     * @param stdClass $data
      * @param int|null $citationNumber
      * @return bool
      */
-    public function validate($value, $citationNumber = null)
+    public function validate(stdClass $data, $citationNumber = null): bool
     {
         return false;
     }
diff --git a/src/Constraint/Factory.php b/src/Constraint/Factory.php
index 58464181..b982f225 100644
--- a/src/Constraint/Factory.php
+++ b/src/Constraint/Factory.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -12,24 +13,14 @@
 use Seboettg\CiteProc\Exception\ClassNotFoundException;
 use function Seboettg\CiteProc\ucfirst;
 
-/**
- * Class Factory
- * @package Seboettg\CiteProc\Constraint
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
- */
 class Factory extends \Seboettg\CiteProc\Util\Factory
 {
     const NAMESPACE_CONSTRAINTS = "Seboettg\\CiteProc\\Constraint\\";
 
     /**
-     * @param string $name
-     * @param string $value
-     * @param string $match
-     * @return mixed
      * @throws ClassNotFoundException
      */
-    public static function createConstraint(string $name, string $value, string $match)
+    public static function createConstraint(string $name, string $value, string $match): Constraint
     {
         $parts = explode("-", $name);
         $className = implode("", array_map(function ($part) {
diff --git a/src/Constraint/IsNumeric.php b/src/Constraint/IsNumeric.php
index 7d8cbd66..965f2c44 100644
--- a/src/Constraint/IsNumeric.php
+++ b/src/Constraint/IsNumeric.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -29,7 +30,7 @@ class IsNumeric extends AbstractConstraint
      * @param stdClass $data
      * @return bool
      */
-    protected function matchForVariable($variable, $data)
+    protected function matchForVariable(string $variable, stdClass $data): bool
     {
         if (isset($data->{$variable})) {
             return $this->parseValue($data->{$variable});
@@ -46,7 +47,7 @@ protected function matchForVariable($variable, $data)
      * @param $evalValue
      * @return bool
      */
-    private function parseValue($evalValue)
+    private function parseValue($evalValue): bool
     {
         if (is_numeric($evalValue)) {
             return true;
diff --git a/src/Constraint/IsUncertainDate.php b/src/Constraint/IsUncertainDate.php
index b6698425..b40060f4 100644
--- a/src/Constraint/IsUncertainDate.php
+++ b/src/Constraint/IsUncertainDate.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -28,7 +29,7 @@ class IsUncertainDate extends AbstractConstraint
      * @param stdClass $data ;
      * @return bool
      */
-    protected function matchForVariable($variable, $data)
+    protected function matchForVariable(string $variable, stdClass $data): bool
     {
         if (!empty($data->{$variable})) {
             if (isset($data->{$variable}->{'circa'})) {
diff --git a/src/Constraint/Jurisdiction.php b/src/Constraint/Jurisdiction.php
index 9368bd38..25b00dbe 100644
--- a/src/Constraint/Jurisdiction.php
+++ b/src/Constraint/Jurisdiction.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -9,22 +10,23 @@
 
 namespace Seboettg\CiteProc\Constraint;
 
+use stdClass;
+
 /**
  * Class Jurisdiction
  * @package Seboettg\CiteProc\Constraint
  *
  * @author Sebastian Böttger <seboettg@gmail.com>
  */
-/** @noinspection PhpUnused */
 class Jurisdiction implements Constraint
 {
     /**
      * @codeCoverageIgnore
-     * @param $value
+     * @param stdClass $data
      * @param int|null $citationNumber
      * @return bool
      */
-    public function validate($value, $citationNumber = null)
+    public function validate(stdClass $data, int $citationNumber = null): bool
     {
         return false;
     }
diff --git a/src/Constraint/Locator.php b/src/Constraint/Locator.php
index 08325ad0..2ae8e665 100644
--- a/src/Constraint/Locator.php
+++ b/src/Constraint/Locator.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -10,26 +11,20 @@
 namespace Seboettg\CiteProc\Constraint;
 
 use Seboettg\CiteProc\CiteProc;
+use stdClass;
 
 /**
  * Class Locator
  *
  * Tests whether the locator matches the given locator types (see Locators). Use “sub-verbo” to test for the
  * “sub verbo” locator type.
- *
- * @codeCoverageIgnore
- *
- * @package Seboettg\CiteProc\Constraint
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
  */
-/** @noinspection PhpUnused */
 class Locator extends AbstractConstraint
 {
     /**
      * @inheritDoc
      */
-    protected function matchForVariable($variable, $data)
+    protected function matchForVariable(string $variable, stdClass $data): bool
     {
         if (!empty($data->id)) {
             $citationItem = CiteProc::getContext()->getCitationItemById($data->id);
diff --git a/src/Constraint/Position.php b/src/Constraint/Position.php
index 69a9a8b6..79e622eb 100644
--- a/src/Constraint/Position.php
+++ b/src/Constraint/Position.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -39,9 +40,6 @@
  * Whenever position=”ibid-with-locator” tests true, position=”ibid” also tests true. And whenever position=”ibid” or
  * position=”near-note” test true, position=”subsequent” also tests true.
  *
- * @package Seboettg\CiteProc\Constraint
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
  */
 class Position implements Constraint
 {
@@ -51,42 +49,42 @@ class Position implements Constraint
     const SUBSEQUENT = "subsequent";
     const NEAR_NOTE = "near-note";
 
-    private $value;
+    private $position;
 
     private $match;
 
-    public function __construct($value, $match = "all")
+    public function __construct(string $position, string $match = "all")
     {
-        $this->value = $value;
+        $this->position = $position;
         $this->match = $match;
     }
 
     /**
      * @codeCoverageIgnore
-     * @param stdClass $object
+     * @param stdClass $data
      * @param int|null $citationNumber
      * @return bool
      */
-    public function validate($object, $citationNumber = null)
+    public function validate(stdClass $data, $citationNumber = null): bool
     {
         if (CiteProc::getContext()->isModeBibliography()) {
             return false;
         }
-        switch ($this->value) {
+        switch ($this->position) {
             case self::FIRST:
-                return $this->getPosition($object) === null;
+                return $this->getPosition($data) === null;
             case self::IBID:
             case self::IBID_WITH_LOCATOR:
             case self::SUBSEQUENT:
-                return $this->isOnLastPosition($object);
+                return $this->isOnLastPosition($data);
         }
         return true;
     }
 
-    private function getPosition($object)
+    private function getPosition(stdClass $data): ?string
     {
         foreach (CiteProc::getContext()->getCitedItems() as $key => $value) {
-            if (!empty($value->{'id'}) && $value->{'id'} === $object->{'id'}) {
+            if (!empty($value->{'id'}) && $value->{'id'} === $data->{'id'}) {
                 return $key;
             }
         }
@@ -94,12 +92,12 @@ private function getPosition($object)
     }
 
     /**
-     * @param stdClass $object
+     * @param stdClass $data
      * @return bool
      */
-    private function isOnLastPosition($object): bool
+    private function isOnLastPosition(stdClass $data): bool
     {
         $lastCitedItem = CiteProc::getContext()->getCitedItems()->last();
-        return !empty($lastCitedItem) ? $lastCitedItem->{'id'} === $object->{'id'} : false;
+        return !empty($lastCitedItem) && $lastCitedItem->{'id'} === $data->{'id'};
     }
 }
diff --git a/src/Constraint/Type.php b/src/Constraint/Type.php
index d3c76883..1cd1b42e 100644
--- a/src/Constraint/Type.php
+++ b/src/Constraint/Type.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -11,13 +12,6 @@
 
 use stdClass;
 
-/**
- * Class Type
- * @package Seboettg\CiteProc\Choose\Constraint
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
- */
-/** @noinspection PhpUnused */
 class Type extends AbstractConstraint
 {
 
@@ -26,8 +20,8 @@ class Type extends AbstractConstraint
      * @param stdClass $data ;
      * @return bool
      */
-    protected function matchForVariable($variable, $data)
+    protected function matchForVariable(string $variable, stdClass $data): bool
     {
-        return in_array($data->type, $this->conditionVariables);
+        return in_array($data->type, $this->conditionVariables->toArray());
     }
 }
diff --git a/src/Constraint/Variable.php b/src/Constraint/Variable.php
index a310e5d6..7e5af880 100644
--- a/src/Constraint/Variable.php
+++ b/src/Constraint/Variable.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -12,13 +13,6 @@
 use Seboettg\CiteProc\CiteProc;
 use stdClass;
 
-/**
- * Class Variable
- * @package Seboettg\CiteProc\Choose\Constraint
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
- */
-/** @noinspection PhpUnused */
 class Variable extends AbstractConstraint
 {
     /**
@@ -26,15 +20,15 @@ class Variable extends AbstractConstraint
      * @param stdClass $data
      * @return bool
      */
-    protected function matchForVariable($variable, $data)
+    protected function matchForVariable(string $variable, stdClass $data): bool
     {
-        $variableExistInCitationItem = false;
+        $variableExistsInCitationItem = false;
         if (CiteProc::getContext()->isModeCitation() && isset($data->id)) {
             $citationItem = CiteProc::getContext()->getCitationItemById($data->id);
             if (!empty($citationItem)) {
-                $variableExistInCitationItem = !empty($citationItem->{$variable});
+                $variableExistsInCitationItem = !empty($citationItem->{$variable});
             }
         }
-        return !empty($data->{$variable}) || $variableExistInCitationItem;
+        return !empty($data->{$variable}) || $variableExistsInCitationItem;
     }
 }
diff --git a/src/Rendering/Choose/Choose.php b/src/Rendering/Choose/Choose.php
index b87ee4f2..18c1506f 100644
--- a/src/Rendering/Choose/Choose.php
+++ b/src/Rendering/Choose/Choose.php
@@ -46,57 +46,65 @@ public function __construct(SimpleXMLElement $node, $parent)
     {
         $this->parent = $parent;
         $this->children = new ArrayList();
-        $elseIf = [];
+        $elseIf = new ArrayList();
         foreach ($node->children() as $child) {
             switch ($child->getName()) {
                 case 'if':
                     $this->children->add("if", new ChooseIf($child, $this));
                     break;
                 case 'else-if':
-                    $elseIf[] = new ChooseElseIf($child, $this);
+                    $elseIf->append(new ChooseElseIf($child, $this));
                     break;
                 case 'else':
                     $this->children->add("else", new ChooseElse($child, $this));
                     break;
             }
         }
-        if (!empty($elseIf)) {
+        if ($elseIf->count() > 0) {
             $this->children->add("elseif", $elseIf);
         }
     }
 
     /**
-     * @param  array|DataList $data
-     * @param  null|int       $citationNumber
+     * @param array|DataList $data
+     * @param null|int $citationNumber
      * @return string
+     * @throws ArrayList\NotConvertibleToStringException
      */
     public function render($data, $citationNumber = null)
     {
-        $arr = [];
+        $result = new ArrayList();
+        $matchedIfs = false;
 
-        // IF
-        if ($prevCondition = $this->children->get("if")->match($data)) {
-            $arr[] = $this->children->get("if")->render($data);
-        } elseif (!$prevCondition && $this->children->hasKey("elseif")) { // ELSEIF
-            /**
-             * @var ChooseElseIf $child
-             */
-            foreach ($this->children->get("elseif") as $child) {
-                $condition = $child->match($data);
-                if ($condition && !$prevCondition) {
-                    $arr[] = $child->render($data);
-                    $prevCondition = true;
-                    break; //break loop as soon as condition matches
-                }
-                $prevCondition = $condition;
+        $ifCondition = $this->children->get("if");
+
+        if ($ifCondition->match($data)) { //IF CONDITION
+            $matchedIfs = true;
+            $result->append($ifCondition->render($data));
+        } elseif ($this->children->hasKey("elseif")) { // ELSEIF
+            $elseIfs = $this->children->get("elseif")
+                ->map(function (ChooseIf $elseIf) use ($data) {
+                    return new Tuple($elseIf, $elseIf->match($data));
+                })
+                ->filter(function (Tuple $elseIfToMatch) {
+                    return $elseIfToMatch->second === true;
+                });
+            $matchedIfs = $elseIfs->count() > 0;
+            if ($matchedIfs) {
+                $result->append(
+                    $elseIfs
+                        ->first() //returns a Tuple
+                        ->first
+                        ->render($data)
+                );
             }
         }
 
-        //ELSE
-        if (!$prevCondition && $this->children->hasKey("else")) {
-            $arr[] = $this->children->get("else")->render($data);
+        // !$matchedIfs ensures that each previous condition has not been met
+        if (!$matchedIfs && $this->children->hasKey("else")) { //ELSE
+            $result->append($this->children->get("else")->render($data));
         }
-        return implode("", $arr);
+        return $result->collectToString("");
     }
 
     /**
diff --git a/src/Rendering/Choose/ChooseElse.php b/src/Rendering/Choose/ChooseElse.php
index 3245c0ce..08c39aaa 100644
--- a/src/Rendering/Choose/ChooseElse.php
+++ b/src/Rendering/Choose/ChooseElse.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -9,12 +10,6 @@
 
 namespace Seboettg\CiteProc\Rendering\Choose;
 
-/**
- * Class ChooseElse
- * @package Seboettg\CiteProc\Node\Choose
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
- */
 class ChooseElse extends ChooseIf
 {
     //render function is inherited from ChooseIf
diff --git a/src/Rendering/Choose/ChooseElseIf.php b/src/Rendering/Choose/ChooseElseIf.php
index 383ce2f3..10f2d668 100644
--- a/src/Rendering/Choose/ChooseElseIf.php
+++ b/src/Rendering/Choose/ChooseElseIf.php
@@ -1,5 +1,6 @@
 <?php
-/**
+declare(strict_types=1);
+/*
  * citeproc-php
  *
  * @link        http://github.com/seboettg/citeproc-php for the source repository
@@ -9,12 +10,6 @@
 
 namespace Seboettg\CiteProc\Rendering\Choose;
 
-/**
- * Class ChooseElseIf
- * @package Seboettg\CiteProc\Node\Choose
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
- */
 class ChooseElseIf extends ChooseElse
 {
 
diff --git a/src/Rendering/Choose/ChooseIf.php b/src/Rendering/Choose/ChooseIf.php
index a956fe89..ecaa78b2 100644
--- a/src/Rendering/Choose/ChooseIf.php
+++ b/src/Rendering/Choose/ChooseIf.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -20,16 +21,10 @@
 use Seboettg\Collection\ArrayList;
 use SimpleXMLElement;
 
-/**
- * Class ChooseIf
- * @package Seboettg\CiteProc\Node\Choose
- *
- * @author Sebastian Böttger <seboettg@gmail.com>
- */
 class ChooseIf implements Rendering, HasParent
 {
     /**
-     * @var ArrayList<Constraint>
+     * @var ArrayList<Constraint>|Constraint[]
      */
     private $constraints;
 
@@ -53,7 +48,7 @@ class ChooseIf implements Rendering, HasParent
      * @throws InvalidStylesheetException
      * @throws ClassNotFoundException
      */
-    public function __construct(SimpleXMLElement $node, $parent)
+    public function __construct(SimpleXMLElement $node, Choose $parent)
     {
         $this->parent = $parent;
         $this->constraints = new ArrayList();
@@ -76,7 +71,7 @@ public function __construct(SimpleXMLElement $node, $parent)
      * @param null|int $citationNumber
      * @return string
      */
-    public function render($data, $citationNumber = null)
+    public function render($data, $citationNumber = null): string
     {
         $ret = [];
         /** @var Rendering $child */
@@ -95,26 +90,40 @@ public function render($data, $citationNumber = null)
      * @param null|int $citationNumber
      * @return bool
      */
-    public function match($data, $citationNumber = null)
+    public function match($data, int $citationNumber = null): bool
     {
         if ($this->constraints->count() === 1) {
             return $this->constraints->current()->validate($data);
         }
-        $result = true;
-        /** @var Constraint $constraint */
-        foreach ($this->constraints as $constraint) {
-            if ($this->match === "any") {
-                if ($constraint->validate($data, $citationNumber)) {
-                    return true;
-                }
-            } else {
-                $result &= $constraint->validate($data, $citationNumber);
-            }
-        }
-        if ($this->constraints->count() > 1 && $this->match === "all") {
-            return (bool) $result;
-        } elseif ($this->match === "none") {
-            return !((bool) $result);
+
+        switch ($this->match) {
+            case Constraint::MATCH_ANY:
+                return $this->constraints
+                    ->map(function (Constraint $constraint) use ($data) {
+                        return $constraint->validate($data);
+                    })
+                    ->filter(function (bool $match) {
+                        return $match === true;
+                    })
+                    ->count() > 0;
+            case Constraint::MATCH_ALL:
+                return $this->constraints
+                    ->map(function (Constraint $constraint) use ($data) {
+                        return $constraint->validate($data);
+                    })
+                    ->filter(function (bool $match) {
+                        return $match === true;
+                    })
+                    ->count() === $this->constraints->count();
+            case Constraint::MATCH_NONE:
+                return !$this->constraints
+                    ->map(function (Constraint $constraint) use ($data) {
+                        return $constraint->validate($data);
+                    })
+                    ->filter(function (bool $match) {
+                        return $match === false;
+                    })
+                    ->count() === $this->constraints->count();
         }
         return false;
     }
@@ -124,7 +133,7 @@ public function match($data, $citationNumber = null)
      * @noinspection PhpUnused
      * @return Choose
      */
-    public function getParent()
+    public function getParent(): Choose
     {
         return $this->parent;
     }
diff --git a/src/Rendering/Choose/Tuple.php b/src/Rendering/Choose/Tuple.php
new file mode 100644
index 00000000..8c811667
--- /dev/null
+++ b/src/Rendering/Choose/Tuple.php
@@ -0,0 +1,23 @@
+<?php
+declare(strict_types=1);
+/*
+ * citeproc-php
+ *
+ * @link        http://github.com/seboettg/citeproc-php for the source repository
+ * @copyright   Copyright (c) 2022 Sebastian Böttger.
+ * @license     https://opensource.org/licenses/MIT
+ */
+
+namespace Seboettg\CiteProc\Rendering\Choose;
+
+class Tuple
+{
+    public $first;
+    public $second;
+
+    public function __construct($first, $second)
+    {
+        $this->first = $first;
+        $this->second = $second;
+    }
+}
diff --git a/src/Rendering/Layout.php b/src/Rendering/Layout.php
index 3f2c2d25..06dcbbc5 100644
--- a/src/Rendering/Layout.php
+++ b/src/Rendering/Layout.php
@@ -128,7 +128,7 @@ private function renderSingle($data, $citationNumber = null)
         $margin = [];
         foreach ($this->children as $key => $child) {
             $rendered = $child->render($data, $citationNumber);
-            $this->getChildsAffixesAndDelimiter($child);
+            $this->getChildrenAffixesAndDelimiter($child);
             if (CiteProc::getContext()->isModeBibliography()
                 && $bibliographyOptions->getSecondFieldAlign() === "flush"
             ) {
diff --git a/src/Rendering/Name/Names.php b/src/Rendering/Name/Names.php
index 71d2e6a8..d8d34fd6 100644
--- a/src/Rendering/Name/Names.php
+++ b/src/Rendering/Name/Names.php
@@ -15,6 +15,7 @@
 use Seboettg\CiteProc\Rendering\HasParent;
 use Seboettg\CiteProc\Rendering\Label;
 use Seboettg\CiteProc\Rendering\Rendering;
+use Seboettg\CiteProc\Rendering\Term\Punctuation;
 use Seboettg\CiteProc\RenderingState;
 use Seboettg\CiteProc\Style\InheritableNameAttributesTrait;
 use Seboettg\CiteProc\Styles\AffixesTrait;
@@ -110,6 +111,11 @@ class Names implements Rendering, HasParent
 
     private $parent;
 
+    /**
+     * @var bool
+     */
+    private $renderLabelBeforeName = false;
+
     /**
      * Names constructor.
      *
@@ -124,10 +130,14 @@ public function __construct(SimpleXMLElement $node, $parent)
         /**
          * @var SimpleXMLElement $child
          */
+
         foreach ($node->children() as $child) {
             switch ($child->getName()) {
                 case "name":
                     $this->name = Factory::create($child, $this);
+                    if ($this->label !== null) {
+                        $this->renderLabelBeforeName = true;
+                    }
                     break;
                 case "label":
                     $this->label = Factory::create($child);
@@ -246,15 +256,27 @@ public function render($data, $citationNumber = null)
      * @param  $name
      * @return string
      */
-    private function appendLabel($data, $var, $name)
+    private function appendLabel($data, $var, $name): string
     {
         $this->label->setVariable($var);
-        if (in_array($this->label->getForm(), ["verb", "verb-short"])) {
-            $name = $this->label->render($data).$name;
+        $renderedLabel = trim($this->label->render($data));
+        if (empty($renderedLabel)) {
+            return $name;
+        }
+        if ($this->renderLabelBeforeName) {
+            $delimiter = !in_array(
+                trim($this->label->renderSuffix()),
+                Punctuation::getAllPunctuations()
+            ) ? " " : "";
+            $result = $renderedLabel . $delimiter . trim($name);
         } else {
-            $name .= $this->label->render($data);
+            $delimiter = !in_array(
+                trim($this->label->renderPrefix()),
+                Punctuation::getAllPunctuations()
+            ) ? " " : "";
+            $result = trim($name) . $delimiter . $renderedLabel;
         }
-        return $name;
+        return $result;
     }
 
     /**
@@ -381,4 +403,20 @@ private function filterEmpty(array $results)
             return !empty($item);
         });
     }
+
+    /**
+     * @return bool
+     */
+    public function isRenderLabelBeforeName(): bool
+    {
+        return $this->renderLabelBeforeName;
+    }
+
+    /**
+     * @param bool $renderLabelBeforeName
+     */
+    public function setRenderLabelBeforeName(bool $renderLabelBeforeName): void
+    {
+        $this->renderLabelBeforeName = $renderLabelBeforeName;
+    }
 }
diff --git a/src/Rendering/Number.php b/src/Rendering/Number.php
index 38279b12..3a229812 100644
--- a/src/Rendering/Number.php
+++ b/src/Rendering/Number.php
@@ -27,11 +27,19 @@
 class Number implements Rendering
 {
 
-    const RANGE_DELIMITER_HYPHEN = "-";
+    private const RANGE_DELIMITER_HYPHEN = "-";
 
-    const RANGE_DELIMITER_AMPERSAND = "&";
+    private const RANGE_DELIMITER_AMPERSAND = "&";
 
-    const RANGE_DELIMITER_COMMA = ",";
+    private const RANGE_DELIMITER_COMMA = ",";
+
+    private const PATTERN_ORDINAL = "/\s*(\d+)\s*([\-\–&,])\s*(\d+)\s*/";
+
+    private const PATTERN_LONG_ORDINAL = "/\s*(\d+)\s*([\-\–&,])\s*(\d+)\s*/";
+
+    private const PATTERN_ROMAN = "/\s*(\d+)\s*([\-\–&,])\s*(\d+)\s*/";
+
+    private const PATTERN_NUMERIC_DEFAULT = "/\s*(\d+)\s*([\-\–&,])\s*(\d+)\s*/";
 
     use FormattingTrait,
         AffixesTrait,
@@ -76,7 +84,7 @@ public function __construct(SimpleXMLElement $node)
      * @param int|null $citationNumber
      * @return string
      */
-    public function render($data, $citationNumber = null)
+    public function render($data, $citationNumber = null): string
     {
         $lang = (isset($data->language) && $data->language != 'en') ? $data->language : 'en';
 
@@ -87,7 +95,7 @@ public function render($data, $citationNumber = null)
         $decimalNumber = $this->toDecimalNumber($number);
         switch ($this->form) {
             case 'ordinal':
-                if (preg_match("/\s*(\d+)\s*([\-\–&,])\s*(\d+)\s*/", $decimalNumber, $matches)) {
+                if (preg_match(self::PATTERN_ORDINAL, $decimalNumber, $matches)) {
                     $num1 = self::ordinal($matches[1]);
                     $num2 = self::ordinal($matches[3]);
                     $text = $this->buildNumberRangeString($num1, $num2, $matches[2]);
@@ -96,7 +104,7 @@ public function render($data, $citationNumber = null)
                 }
                 break;
             case 'long-ordinal':
-                if (preg_match("/\s*(\d+)\s*([\-\–&,])\s*(\d+)\s*/", $decimalNumber, $matches)) {
+                if (preg_match(self::PATTERN_LONG_ORDINAL, $decimalNumber, $matches)) {
                     if ($this->textCase === "capitalize-first" || $this->textCase === "sentence") {
                         $num1 = self::longOrdinal($matches[1]);
                         $num2 = self::longOrdinal($matches[3]);
@@ -110,7 +118,7 @@ public function render($data, $citationNumber = null)
                 }
                 break;
             case 'roman':
-                if (preg_match("/\s*(\d+)\s*([\-\–&,])\s*(\d+)\s*/", $decimalNumber, $matches)) {
+                if (preg_match(self::PATTERN_ROMAN, $decimalNumber, $matches)) {
                     $num1 = Util\NumberHelper::dec2roman($matches[1]);
                     $num2 = Util\NumberHelper::dec2roman($matches[3]);
                     $text = $this->buildNumberRangeString($num1, $num2, $matches[2]);
@@ -127,7 +135,7 @@ public function render($data, $citationNumber = null)
                  ampersand (“2&3” becomes “2 & 3”).
                  */
                 $decimalNumber = $data->{$this->variable};
-                if (preg_match("/\s*(\d+)\s*([\-\–&,])\s*(\d+)\s*/", $decimalNumber, $matches)) {
+                if (preg_match(self::PATTERN_NUMERIC_DEFAULT, $decimalNumber, $matches)) {
                     $text = $this->buildNumberRangeString($matches[1], $matches[3], $matches[2]);
                 } else {
                     $text = $decimalNumber;
@@ -141,7 +149,7 @@ public function render($data, $citationNumber = null)
      * @param $num
      * @return string
      */
-    public static function ordinal($num)
+    public static function ordinal($num): string
     {
         if (($num / 10) % 10 == 1) {
             $ordinalSuffix = CiteProc::getContext()->getLocale()->filter('terms', 'ordinal')->single;
@@ -157,7 +165,7 @@ public static function ordinal($num)
         if (empty($ordinalSuffix)) {
             $ordinalSuffix = CiteProc::getContext()->getLocale()->filter('terms', 'ordinal')->single;
         }
-        return $num.$ordinalSuffix;
+        return $num . $ordinalSuffix;
     }
 
     /**
diff --git a/src/Rendering/Term/Punctuation.php b/src/Rendering/Term/Punctuation.php
new file mode 100644
index 00000000..d8110cca
--- /dev/null
+++ b/src/Rendering/Term/Punctuation.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Seboettg\CiteProc\Rendering\Term;
+
+use MyCLabs\Enum\Enum;
+use Seboettg\CiteProc\CiteProc;
+use Seboettg\Collection\ArrayList;
+
+class Punctuation extends Enum
+{
+    public const OPEN_QUOTE = "open-quote";
+    public const CLOSE_QUOTE = "close-quote";
+    public const OPEN_INNER_QUOTE = "open-inner-quote";
+    public const CLOSE_INNER_QUOTE = "close-inner-quote";
+    public const PAGE_RANGE_DELIMITER = "page-range-delimiter";
+    public const COLON = "colon";
+    public const COMMA = "comma";
+    public const SEMICOLON = "semicolon";
+
+    public static function getAllPunctuations(): array
+    {
+        $values = new ArrayList();
+        return $values
+            ->setArray(Punctuation::toArray())
+            ->map(function (string $punctuation) {
+                return CiteProc::getContext()->getLocale()->filter("terms", $punctuation)->single;
+            })
+            ->collect(function ($items) {
+                return array_values($items);
+            });
+    }
+}
diff --git a/src/Rendering/Text.php b/src/Rendering/Text.php
index 205bbcc6..37bdc99e 100644
--- a/src/Rendering/Text.php
+++ b/src/Rendering/Text.php
@@ -113,8 +113,8 @@ public function render($data, $citationNumber = null)
                     unset($data->{$this->toRenderTypeValue});
                 }
                 if (!CiteProcHelper::isUsingAffixesByMarkupExtentsion($data, $this->toRenderTypeValue)) {
-					$renderedText = $this->applyAdditionalMarkupFunction($data, $renderedText);
-				}
+                    $renderedText = $this->applyAdditionalMarkupFunction($data, $renderedText);
+                }
                 break;
             case 'macro':
                 $renderedText = $this->renderMacro($data);
@@ -241,17 +241,17 @@ private function renderVariable($data, $lang)
     }
 
     /**
-	 * @param  $data
-	 * @param  $renderedText
+     * @param  $data
+     * @param  $renderedText
      * @return string
      */
     private function formatRenderedText($data, $renderedText)
     {
         $text = $this->format($renderedText);
         $res = $this->addAffixes($text);
-		if (CiteProcHelper::isUsingAffixesByMarkupExtentsion($data, $this->toRenderTypeValue)) {
-			$res = $this->applyAdditionalMarkupFunction($data, $res);
-		}
+        if (CiteProcHelper::isUsingAffixesByMarkupExtentsion($data, $this->toRenderTypeValue)) {
+            $res = $this->applyAdditionalMarkupFunction($data, $res);
+        }
         if (!empty($res)) {
             $res = $this->removeConsecutiveChars($res);
         }
@@ -267,9 +267,9 @@ private function formatRenderedText($data, $renderedText)
     private function renderCitationNumber($data, $citationNumber)
     {
         $renderedText = $citationNumber + 1;
-		if (!CiteProcHelper::isUsingAffixesByMarkupExtentsion($data, $this->toRenderTypeValue)) {
-			$renderedText = $this->applyAdditionalMarkupFunction($data, $renderedText);
-		}
+        if (!CiteProcHelper::isUsingAffixesByMarkupExtentsion($data, $this->toRenderTypeValue)) {
+            $renderedText = $this->applyAdditionalMarkupFunction($data, $renderedText);
+        }
         return $renderedText;
     }
 
diff --git a/src/Style/Macro.php b/src/Style/Macro.php
index b7f53cd3..52e9646b 100644
--- a/src/Style/Macro.php
+++ b/src/Style/Macro.php
@@ -84,7 +84,7 @@ public function render($data, $citationNumber = null)
         /** @var Rendering $child */
         foreach ($this->children as $child) {
             $res = $child->render($data, $citationNumber);
-            $this->getChildsAffixesAndDelimiter($child);
+            $this->getChildrenAffixesAndDelimiter($child);
             if (!empty($res)) {
                 $ret[] = $res;
             }
diff --git a/src/Style/Options/GlobalOptions.php b/src/Style/Options/GlobalOptions.php
index b85f0bdb..dd0954fe 100644
--- a/src/Style/Options/GlobalOptions.php
+++ b/src/Style/Options/GlobalOptions.php
@@ -43,7 +43,7 @@ public function __construct(SimpleXMLElement $node)
         foreach ($node->attributes() as $attribute) {
             switch ($attribute->getName()) {
                 case 'initialize-with-hyphen':
-                    $this->initializeWithHyphen = "false" === (string) $attribute ? false : true;
+                    $this->initializeWithHyphen = !("false" === (string) $attribute);
                     break;
                 case 'page-range-format':
                     $this->pageRangeFormat = new PageRangeFormats((string) $attribute);
@@ -59,7 +59,7 @@ public function __construct(SimpleXMLElement $node)
      * “true”, default) or without (“J.L.”, value “false”).
      * @return bool
      */
-    public function isInitializeWithHyphen()
+    public function isInitializeWithHyphen(): bool
     {
         return $this->initializeWithHyphen;
     }
@@ -71,7 +71,7 @@ public function isInitializeWithHyphen()
      * not set, page ranges are rendered without reformatting.
      * @return PageRangeFormats
      */
-    public function getPageRangeFormat()
+    public function getPageRangeFormat(): ?PageRangeFormats
     {
         return $this->pageRangeFormat;
     }
@@ -80,7 +80,7 @@ public function getPageRangeFormat()
      * Sets the display and sorting behavior of the non-dropping-particle in inverted names (e.g. “Koning, W. de”).
      * @return DemoteNonDroppingParticle
      */
-    public function getDemoteNonDroppingParticles()
+    public function getDemoteNonDroppingParticles(): ?DemoteNonDroppingParticle
     {
         return $this->demoteNonDroppingParticles;
     }
diff --git a/src/StyleSheet.php b/src/StyleSheet.php
index b42d5530..4126e503 100644
--- a/src/StyleSheet.php
+++ b/src/StyleSheet.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
@@ -32,10 +33,10 @@ class StyleSheet
      * @return string
      * @throws CiteProcException
      */
-    public static function loadStyleSheet($styleName)
+    public static function loadStyleSheet(string $styleName): string
     {
-        $stylesPath = self::vendorPath()."/citation-style-language/styles-distribution/";
-        return file_get_contents($stylesPath.$styleName.'.csl');
+        $stylesPath = self::vendorPath() . "/citation-style-language/styles";
+        return self::readFileContentsOrThrowException("$stylesPath/$styleName.csl");
     }
 
     /**
@@ -45,23 +46,33 @@ public static function loadStyleSheet($styleName)
      * @return string
      * @throws CiteProcException
      */
-    public static function loadLocales($langKey)
+    public static function loadLocales(string $langKey): string
     {
-        $data = null;
-        $localesPath = self::vendorPath()."/citation-style-language/locales/";
-        $localeFile = $localesPath."locales-".$langKey.'.xml';
+        $localesPath = self::vendorPath()."/citation-style-language/locales";
+        $localeFile = "$localesPath/locales-${langKey}.xml";
         if (file_exists($localeFile)) {
-            $data = file_get_contents($localeFile);
+            return self::readFileContentsOrThrowException($localeFile);
         } else {
             $metadata = self::loadLocalesMetadata();
             if (!empty($metadata->{'primary-dialects'}->{$langKey})) {
-                $data = file_get_contents(
-                    $localesPath."locales-".$metadata->{'primary-dialects'}->{$langKey}.'.xml'
+                return self::readFileContentsOrThrowException(
+                    sprintf("%s/locales-%s.xml", $localesPath, $metadata->{'primary-dialects'}->{$langKey})
                 );
             }
         }
+        throw new CiteProcException("No Locale file found for $langKey");
+    }
 
-        return $data;
+    /**
+     * @throws CiteProcException
+     */
+    private static function readFileContentsOrThrowException($path): string
+    {
+        $fileContent = file_get_contents($path);
+        if (false === $fileContent) {
+            throw new CiteProcException("Couldn't read $path");
+        }
+        return $fileContent;
     }
 
     /**
@@ -70,8 +81,8 @@ public static function loadLocales($langKey)
      */
     public static function loadLocalesMetadata()
     {
-        $localesMetadataPath = self::vendorPath()."/citation-style-language/locales/locales.json";
-        return json_decode(file_get_contents($localesMetadataPath));
+        $localesMetadataPath = self::vendorPath() . "/citation-style-language/locales/locales.json";
+        return json_decode(self::readFileContentsOrThrowException($localesMetadataPath));
     }
 
     /**
@@ -80,11 +91,9 @@ public static function loadLocalesMetadata()
      */
     private static function vendorPath()
     {
-        include_once realpath(__DIR__.'/../').'/vendorPath.php';
+        include_once realpath(__DIR__ . '/../') . '/vendorPath.php';
         if (!($vendorPath = vendorPath())) {
-            // @codeCoverageIgnoreStart
             throw new CiteProcException('vendor path not found. Use composer to initialize your project');
-            // @codeCoverageIgnoreEnd
         }
         return $vendorPath;
     }
diff --git a/src/Styles/ConsecutivePunctuationCharacterTrait.php b/src/Styles/ConsecutivePunctuationCharacterTrait.php
index deec6714..e542bf90 100644
--- a/src/Styles/ConsecutivePunctuationCharacterTrait.php
+++ b/src/Styles/ConsecutivePunctuationCharacterTrait.php
@@ -37,7 +37,7 @@ trait ConsecutivePunctuationCharacterTrait
      * @param $subject
      * @return string
      */
-    public function removeConsecutivePunctuation($punctuationSign, $subject)
+    public function removeConsecutivePunctuation($punctuationSign, $subject): string
     {
         if (empty($punctuationSign) || preg_match("/^\s+$/", $punctuationSign)) {
             return $subject;
@@ -52,7 +52,7 @@ public function removeConsecutivePunctuation($punctuationSign, $subject)
     /**
      * @param $child
      */
-    protected function getChildsAffixesAndDelimiter($child)
+    protected function getChildrenAffixesAndDelimiter($child)
     {
         if (method_exists($child, "renderPrefix")) {
             if (!empty($child->renderPrefix()) && !in_array($child->renderPrefix(), $this->childrenPrefixes)) {
diff --git a/src/Util/CiteProcHelper.php b/src/Util/CiteProcHelper.php
index f2c8e536..b7f2034f 100644
--- a/src/Util/CiteProcHelper.php
+++ b/src/Util/CiteProcHelper.php
@@ -27,21 +27,21 @@ public static function applyAdditionMarkupFunction($dataItem, $valueToRender, $r
     {
         $markupExtension = CiteProc::getContext()->getMarkupExtension();
         if (array_key_exists($valueToRender, $markupExtension)) {
-        	if (is_array($markupExtension[$valueToRender]) && array_key_exists('function', $markupExtension[$valueToRender])) {
-				$function = $markupExtension[$valueToRender]['function'];
-			} else {
-				$function = $markupExtension[$valueToRender];
-			}
+            if (is_array($markupExtension[$valueToRender]) && array_key_exists('function', $markupExtension[$valueToRender])) {
+                $function = $markupExtension[$valueToRender]['function'];
+            } else {
+                $function = $markupExtension[$valueToRender];
+            }
             if (is_callable($function)) {
                 $renderedText = $function($dataItem, $renderedText);
             }
         } elseif (array_key_exists($mode = CiteProc::getContext()->getMode(), $markupExtension)) {
             if (array_key_exists($valueToRender, $markupExtension[$mode])) {
-				if (is_array($markupExtension[$mode][$valueToRender]) && array_key_exists('function', $markupExtension[$mode][$valueToRender])) {
-					$function = CiteProc::getContext()->getMarkupExtension()[$mode][$valueToRender]['function'];
-				} else {
-					$function = CiteProc::getContext()->getMarkupExtension()[$mode][$valueToRender];
-				}
+                if (is_array($markupExtension[$mode][$valueToRender]) && array_key_exists('function', $markupExtension[$mode][$valueToRender])) {
+                    $function = CiteProc::getContext()->getMarkupExtension()[$mode][$valueToRender]['function'];
+                } else {
+                    $function = CiteProc::getContext()->getMarkupExtension()[$mode][$valueToRender];
+                }
                 if (is_callable($function)) {
                     $renderedText = $function($dataItem, $renderedText);
                 }
@@ -63,26 +63,26 @@ public static function cloneArray(array $array)
         return $newArray;
     }
 
-	/**
-	 * @param stdClass $dataItem the actual item
-	 * @param string $valueToRender value the has to apply on
-	 * @return bool
-	 */
+    /**
+     * @param stdClass $dataItem the actual item
+     * @param string $valueToRender value the has to apply on
+     * @return bool
+     */
     public static function isUsingAffixesByMarkupExtentsion($dataItem, $valueToRender)
-	{
-		$markupExtension = CiteProc::getContext()->getMarkupExtension();
-		if (array_key_exists($valueToRender, $markupExtension)) {
-			if (is_array($markupExtension[$valueToRender]) && array_key_exists('affixes', $markupExtension[$valueToRender])) {
-				return $markupExtension[$valueToRender]['affixes'];
-			}
-		} elseif (array_key_exists($mode = CiteProc::getContext()->getMode(), $markupExtension)) {
-			if (array_key_exists($valueToRender, $markupExtension[$mode])) {
-				if (is_array($markupExtension[$mode][$valueToRender]) && array_key_exists('affixes', $markupExtension[$mode][$valueToRender])) {
-					return CiteProc::getContext()->getMarkupExtension()[$mode][$valueToRender]['affixes'];
-				}
-			}
-		}
+    {
+        $markupExtension = CiteProc::getContext()->getMarkupExtension();
+        if (array_key_exists($valueToRender, $markupExtension)) {
+            if (is_array($markupExtension[$valueToRender]) && array_key_exists('affixes', $markupExtension[$valueToRender])) {
+                return $markupExtension[$valueToRender]['affixes'];
+            }
+        } elseif (array_key_exists($mode = CiteProc::getContext()->getMode(), $markupExtension)) {
+            if (array_key_exists($valueToRender, $markupExtension[$mode])) {
+                if (is_array($markupExtension[$mode][$valueToRender]) && array_key_exists('affixes', $markupExtension[$mode][$valueToRender])) {
+                    return CiteProc::getContext()->getMarkupExtension()[$mode][$valueToRender]['affixes'];
+                }
+            }
+        }
 
-		return FALSE;
-	}
+        return false;
+    }
 }
diff --git a/src/Util/NumberHelper.php b/src/Util/NumberHelper.php
index a2ff3d6f..e791e8fb 100644
--- a/src/Util/NumberHelper.php
+++ b/src/Util/NumberHelper.php
@@ -20,7 +20,7 @@
 class NumberHelper
 {
 
-    const PATTERN_ORDINAL = "/\d+(st|nd|rd|th)?\.?$/";
+    const PATTERN_ORDINAL = "/\d+((st|nd|rd|th)\.?|\.)$/";
 
     const PATTERN_ROMAN = "/^[ivxlcdm]+\.?$/i";
 
@@ -28,7 +28,7 @@ class NumberHelper
 
     const PATTERN_AFFIXES = "/^[a-z]?\d+[a-z]?$/i";
 
-    const PATTERN_COMMA_AMPERSAND_RANGE = "/\d*([\s?\-&+,;\s])+\d+/";
+    const PATTERN_COMMA_AMPERSAND_RANGE = "/\d+([\s?\-&+,;\s])+\d+/";
 
     const ROMAN_NUMERALS = [
         ["", "i", "ii", "iii", "iv", "v", "vi", "vii", "viii", "ix"],
diff --git a/src/functions.php b/src/functions.php
index 9be4d45c..905116e5 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * citeproc-php
  *
diff --git a/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-116.txt b/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-116.txt
new file mode 100644
index 00000000..27a10c14
--- /dev/null
+++ b/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-116.txt
@@ -0,0 +1,1423 @@
+>>===== MODE =====>>
+bibliography
+<<===== MODE =====<<
+
+>>===== RESULT =====>>
+<div class="csl-bib-body">
+  <div class="csl-entry">Abramson, Daniel. “Bank of England”. In <i>John Soane Architect: Master of Space and Light</i>, edited by Margaret Richardson and Mary Anne Stevens, 208-51. London: Royal Academy of Arts, 1999.</div>
+</div>
+<<===== RESULT =====<<
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
+  <info>
+    <title>Chicago Manual of Style 16th edition (full note)</title>
+    <id>http://www.zotero.org/styles/chicago-fullnote-bibliography-16th-edition</id>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography-16th-edition" rel="self"/>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Simon Kornblith</name>
+      <email>simon@simonster.com</email>
+    </contributor>
+    <contributor>
+      <name>Elena Razlogova</name>
+      <email>elena.razlogova@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Frank Bennett</name>
+      <email>biercenator@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Andrew Dunning</name>
+      <email>andrew.dunning@utoronto.ca</email>
+    </contributor>
+    <contributor>
+      <name>Brenton M. Wiernik</name>
+    </contributor>
+    <category citation-format="note"/>
+    <category field="generic-base"/>
+    <summary>Chicago format with full notes and bibliography</summary>
+    <updated>2017-10-12T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="translator" form="verb-short">trans.</term>
+      <term name="translator" form="short">trans.</term>
+      <term name="editortranslator" form="verb-short">ed. and trans.</term>
+      <term name="editortranslator" form="verb">Edited and translated by</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="container-author reviewed-author" match="any">
+            <group>
+              <names variable="container-author reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </group>
+      <names variable="editor translator" delimiter=", ">
+        <label form="verb-short" text-case="lowercase" suffix=" "/>
+        <name and="text" delimiter=", "/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-note">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors-note">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" delimiter=", "/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if variable="author">
+              <choose>
+                <if variable="container-author" match="any">
+                  <names variable="container-author">
+                    <label form="verb-short" text-case="lowercase" suffix=" "/>
+                    <name and="text" delimiter=", "/>
+                  </names>
+                </if>
+              </choose>
+              <!--This includes page numers after the container author, e.g. for Introductions -->
+              <choose>
+                <if variable="container-author author" match="all">
+                  <group delimiter=". ">
+                    <text variable="page"/>
+                    <names variable="editor translator" delimiter=", ">
+                      <label form="verb" suffix=" "/>
+                      <name and="text" delimiter=", "/>
+                    </names>
+                  </group>
+                </if>
+                <else>
+                  <names variable="editor translator" delimiter=", ">
+                    <label form="verb" text-case="lowercase" suffix=" "/>
+                    <name and="text" delimiter=", "/>
+                  </names>
+                </else>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-note">
+    <group delimiter=" ">
+      <names variable="author">
+        <name and="text" sort-separator=", " delimiter=", "/>
+        <label form="short" prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="verb-short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <group delimiter=" ">
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="letter" text-case="capitalize-first"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="contributors">
+    <group delimiter=". ">
+      <names variable="author">
+        <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+        <substitute>
+          <text macro="editor"/>
+          <text macro="translator"/>
+          <choose>
+            <if type="article-magazine article-newspaper webpage post-weblog" match="any">
+              <text variable="container-title"/>
+            </if>
+          </choose>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name form="short" and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <group delimiter=" ">
+      <names variable="author">
+        <name form="short" and="text" delimiter=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient-short"/>
+    </group>
+  </macro>
+  <macro name="contributors-sort">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer-note">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if variable="title" match="none">
+        <text variable="genre"/>
+      </if>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group delimiter=" " prefix=", ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <text variable="title" font-style="italic" prefix="review of "/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <group delimiter=", ">
+          <text variable="title" font-style="italic" prefix="Review of "/>
+          <names variable="reviewed-author">
+            <label form="verb-short" text-case="lowercase" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="interview">
+            <text term="interview"/>
+          </if>
+          <else-if type="manuscript speech" match="any">
+            <text variable="genre" form="short"/>
+          </else-if>
+          <else-if type="personal_communication">
+            <text macro="issued"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if type="legal_case" variable="title-short" match="all">
+        <text variable="title" font-style="italic" form="short"/>
+      </else-if>
+      <else-if type="patent interview" match="any">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="legal_case bill legislation" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-disambiguate">
+    <choose>
+      <if disambiguate="true">
+        <text macro="issued"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="description-note">
+    <group delimiter=", ">
+      <text macro="interviewer-note"/>
+      <text variable="medium"/>
+      <choose>
+        <if variable="title" match="none"/>
+        <else-if type="manuscript thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
+        <else>
+          <text variable="genre"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="description">
+    <group delimiter=", ">
+      <group delimiter=". ">
+        <text macro="interviewer"/>
+        <text variable="medium" text-case="capitalize-first"/>
+      </group>
+      <choose>
+        <if variable="title" match="none"/>
+        <else-if type="thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
+        <else>
+          <text variable="genre" text-case="capitalize-first"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-title-note">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+          <text term="in"/>
+        </if>
+      </choose>
+      <choose>
+        <if type="bill legislation legal_case" match="none">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+          <text term="in" text-case="capitalize-first"/>
+        </if>
+      </choose>
+      <choose>
+        <if type="bill legislation legal_case" match="none">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal">
+        <choose>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-title-journal">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=" ">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition-note">
+    <choose>
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" suffix="."/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note-join-with-space">
+    <choose>
+      <if type="article-journal" variable="volume" match="all">
+        <choose>
+          <if match="none" variable="collection-title">
+            <text macro="locators-note"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note-join-with-comma">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="locators-note"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume" match="none">
+            <text macro="locators-note"/>
+          </if>
+          <else-if match="any" variable="collection-title">
+            <text macro="locators-note"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-note">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", ">
+          <text macro="collection-title-journal"/>
+          <number variable="volume"/>
+          <group delimiter=" ">
+            <text term="issue" form="short"/>
+            <number variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+      <else-if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition-note"/>
+          <group delimiter=" ">
+            <text term="volume" form="short"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <choose>
+            <if variable="locator" match="none">
+              <group delimiter=" ">
+                <number variable="number-of-volumes" form="numeric"/>
+                <text term="volume" form="short" plural="true"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case" match="any">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <text variable="page"/>
+            </if>
+            <else>
+              <text variable="number" prefix="No. "/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if variable="number">
+              <!--There's a public law number-->
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-join-with-space">
+    <choose>
+      <if type="article-journal" variable="volume" match="all">
+        <choose>
+          <if match="none" variable="collection-title">
+            <text macro="locators"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-join-with-comma">
+    <choose>
+      <if type="bill chapter legislation legal_case paper-conference" match="any">
+        <text macro="locators"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume" match="none">
+            <text macro="locators"/>
+          </if>
+          <else-if match="any" variable="collection-title">
+            <text macro="locators"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-join-with-period">
+    <choose>
+      <if type="bill legislation legal_case article-journal chapter paper-conference" match="none">
+        <text macro="locators"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", ">
+          <text macro="collection-title-journal"/>
+          <number variable="volume"/>
+          <group delimiter=" ">
+            <text term="issue" form="short"/>
+            <number variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+      <else-if type="book graphic motion_picture report song" match="any">
+        <group delimiter=". ">
+          <text macro="edition"/>
+          <group delimiter=" ">
+            <text term="volume" form="short" text-case="capitalize-first"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group delimiter=" ">
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" plural="true"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <group delimiter=". ">
+          <text macro="edition"/>
+          <choose>
+            <if variable="page" match="none">
+              <group delimiter=" ">
+                <text term="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-newspaper">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <number variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group delimiter=" ">
+            <text term="section" form="short"/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event-note">
+    <text variable="event"/>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <choose>
+            <if variable="genre">
+              <text term="presented at"/>
+            </if>
+            <else>
+              <text term="presented at" text-case="capitalize-first"/>
+            </else>
+          </choose>
+          <text variable="event"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text term="presented at" text-case="capitalize-first"/>
+          <text variable="event"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="originally-published">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="original-publisher-place"/>
+        <text variable="original-publisher"/>
+      </group>
+      <date variable="original-date" form="text" date-parts="year"/>
+    </group>
+  </macro>
+  <macro name="reprint-note">
+    <!--needs localization-->
+    <choose>
+      <if variable="original-date issued" match="all">
+        <choose>
+          <!--for whatever reason in notes, when we have both original and new publishers, reprint doesn't appear-->
+          <if variable="original-publisher original-publisher-place" match="none">
+            <text value="repr."/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="reprint">
+    <!--needs localization-->
+    <choose>
+      <if variable="original-date issued" match="all">
+        <text value="reprint" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <text variable="publisher"/>
+      </if>
+      <else-if type="speech">
+        <text variable="event-place"/>
+      </else-if>
+      <else>
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <choose>
+          <if type="graphic report" match="any">
+            <date variable="issued" form="text"/>
+          </if>
+          <else-if type="legal_case">
+            <group delimiter=" ">
+              <text variable="authority"/>
+              <choose>
+                <if variable="container-title" match="any">
+                  <!--Only print year for cases published in reporters-->
+                  <date variable="issued" form="numeric" date-parts="year"/>
+                </if>
+                <else>
+                  <date variable="issued" form="text"/>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+          <else-if type="book bill chapter graphic legislation motion_picture paper-conference report song thesis" match="any">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!--Needs Localization-->
+                <text value="filed"/>
+                <date variable="submitted" form="text"/>
+              </group>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="issued submitted" match="all">
+                    <text term="and"/>
+                  </if>
+                </choose>
+                <!--Needs Localization-->
+                <text value="issued"/>
+                <date variable="issued" form="text"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <date variable="issued" form="text"/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else-if variable="accessed URL" match="all"/>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators-subsequent">
+    <choose>
+      <if type="legal_case" variable="locator" match="all">
+        <choose>
+          <if locator="page">
+            <group delimiter=":">
+              <number variable="volume"/>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <label variable="locator" form="short"/>
+              <text variable="locator"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <group delimiter=" ">
+              <choose>
+                <if type="book graphic motion_picture report song" match="any">
+                  <choose>
+                    <if variable="volume">
+                      <group delimiter=", ">
+                        <group delimiter=" ">
+                          <text term="volume" form="short"/>
+                          <number variable="volume" form="numeric"/>
+                        </group>
+                        <label variable="locator" form="short"/>
+                      </group>
+                    </if>
+                    <else>
+                      <label variable="locator" form="short"/>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <label variable="locator" form="short"/>
+                </else>
+              </choose>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else-if type="book graphic motion_picture report song" match="any">
+            <group delimiter=":">
+              <number variable="volume" form="numeric"/>
+              <text variable="locator"/>
+            </group>
+          </else-if>
+          <else>
+            <text variable="locator"/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators-join-with-colon">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="locator page" match="any">
+            <choose>
+              <if variable="volume issue" match="any">
+                <text macro="point-locators"/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="point-locators-join-with-comma">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="point-locators"/>
+      </if>
+      <else-if variable="volume issue" match="none">
+        <text macro="point-locators"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator" match="none">
+        <choose>
+          <if type="article-journal chapter paper-conference" match="any">
+            <text variable="page"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article-journal">
+        <group delimiter=" ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short" suffix=" "/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case"/>
+      <else>
+        <group delimiter=" ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short"/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if variable="author container-author" match="all"/>
+          <else>
+            <choose>
+              <if variable="page">
+                <number variable="volume" suffix=":"/>
+                <text variable="page"/>
+              </if>
+            </choose>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-journal-join-with-colon">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text variable="page"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-journal-join-with-comma">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="none">
+            <text variable="page"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="archive-note">
+    <choose>
+      <if type="thesis">
+        <group delimiter=" ">
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="archive_location"/>
+          <text variable="archive"/>
+          <text variable="archive-place"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <choose>
+      <if type="thesis">
+        <group delimiter=" ">
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=". ">
+          <text variable="archive_location" text-case="capitalize-first"/>
+          <text variable="archive"/>
+          <text variable="archive-place"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue-note-join-with-space">
+    <choose>
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
+        <!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
+        <choose>
+          <if type="article-newspaper" match="none">
+            <choose>
+              <if type="article-journal" match="none">
+                <text macro="issue-note"/>
+              </if>
+              <else-if variable="issue volume" match="any">
+                <text macro="issue-note"/>
+              </else-if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue-note-join-with-comma">
+    <choose>
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
+        <text macro="issue-note"/>
+      </if>
+      <else-if type="article-newspaper">
+        <text macro="issue-note"/>
+      </else-if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="none">
+            <text macro="issue-note"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="bill legislation legal_case" match="any">
+        <text macro="issued" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text macro="issued" prefix="(" suffix=")"/>
+          </if>
+          <else>
+            <text macro="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="article-newspaper">
+        <text macro="issued"/>
+      </else-if>
+      <else-if variable="publisher-place event-place publisher genre" match="any">
+        <group prefix="(" suffix=")" delimiter=", ">
+          <choose>
+            <if variable="title" match="none"/>
+            <else-if type="manuscript thesis speech" match="any">
+              <text variable="genre"/>
+            </else-if>
+          </choose>
+          <text macro="event-note"/>
+          <group delimiter="; ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint-note"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue-join-with-space">
+    <choose>
+      <if type="article-journal" match="any">
+        <choose>
+          <if variable="issue volume" match="any">
+            <text macro="issue"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="issue"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-join-with-period">
+    <choose>
+      <if type="article-journal bill legislation legal_case" match="none">
+        <choose>
+          <if type="speech" variable="publisher publisher-place" match="any">
+            <text macro="issue"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue-join-with-comma">
+    <choose>
+      <if type="bill legislation legal_case" match="none">
+        <choose>
+          <if type="article-journal" match="none">
+            <choose>
+              <if type="speech" variable="publisher publisher-place" match="none">
+                <text macro="issue"/>
+              </if>
+            </choose>
+          </if>
+          <else-if variable="volume issue" match="none">
+            <text macro="issue"/>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="bill legislation legal_case" match="any">
+        <text macro="issued" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="issue volume" match="any">
+            <text macro="issued" prefix="(" suffix=")"/>
+          </if>
+          <else>
+            <text macro="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="title" match="none"/>
+              <else>
+                <text variable="genre" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <text macro="event"/>
+          </group>
+          <text variable="event-place"/>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <!--Chicago doesn't use publisher/place for Newspapers -->
+      <else-if type="article-newspaper">
+        <text macro="issued"/>
+      </else-if>
+      <else-if variable="publisher-place publisher" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <group delimiter=". ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive-note"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive-note"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="doi:"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="doi:"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="case-locator-subsequent">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <text variable="volume"/>
+          <text variable="container-title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="case-pinpoint-subsequent">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if locator="page">
+              <text term="at"/>
+              <text variable="locator"/>
+            </if>
+            <else>
+              <label variable="locator"/>
+              <text variable="locator"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid"/>
+            <text macro="point-locators-subsequent"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid"/>
+        </else-if>
+        <else-if position="subsequent">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <text macro="title-short"/>
+                <!--if title & author are the same: -->
+                <text macro="date-disambiguate"/>
+                <text macro="case-locator-subsequent"/>
+              </group>
+              <text macro="case-pinpoint-subsequent"/>
+            </group>
+            <choose>
+              <if match="none" type="legal_case">
+                <text macro="point-locators-subsequent"/>
+              </if>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <group delimiter=": ">
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group delimiter=" ">
+                      <group delimiter=", ">
+                        <group delimiter=", ">
+                          <text macro="contributors-note"/>
+                          <text macro="title-note"/>
+                        </group>
+                        <text macro="description-note"/>
+                        <text macro="secondary-contributors-note"/>
+                        <text macro="container-title-note"/>
+                        <text macro="container-contributors-note"/>
+                      </group>
+                      <text macro="locators-note-join-with-space"/>
+                    </group>
+                    <text macro="locators-note-join-with-comma"/>
+                    <text macro="collection-title"/>
+                    <text macro="issue-note-join-with-comma"/>
+                  </group>
+                  <text macro="issue-note-join-with-space"/>
+                </group>
+                <text macro="locators-newspaper"/>
+                <text macro="point-locators-join-with-comma"/>
+              </group>
+              <text macro="point-locators-join-with-colon"/>
+            </group>
+            <text macro="access-note"/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+    <sort>
+      <key macro="contributors-sort"/>
+      <key variable="title"/>
+      <key variable="genre"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <group delimiter=": ">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <group delimiter=". ">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <group delimiter=". ">
+                      <group delimiter=". ">
+                        <text macro="contributors"/>
+                        <text macro="title"/>
+                      </group>
+                      <text macro="description"/>
+                      <text macro="secondary-contributors"/>
+                      <group delimiter=", ">
+                        <text macro="container-title"/>
+                        <text macro="container-contributors"/>
+                      </group>
+                      <text macro="locators-join-with-period"/>
+                    </group>
+                    <text macro="locators-join-with-comma"/>
+                    <text macro="locators-chapter"/>
+                  </group>
+                  <text macro="locators-join-with-space"/>
+                </group>
+                <text macro="collection-title"/>
+                <text macro="issue-join-with-period"/>
+              </group>
+              <text macro="issue-join-with-space"/>
+            </group>
+            <text macro="issue-join-with-comma"/>
+            <text macro="locators-journal-join-with-comma"/>
+            <text macro="locators-newspaper"/>
+          </group>
+          <text macro="locators-journal-join-with-colon"/>
+        </group>
+        <text macro="access"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+>>===== INPUT =====>>
+[
+    {
+        "author": [
+            {
+                "family": "Abramson",
+                "given": "Daniel"
+            }
+        ],
+        "citation-label": "abramson_bank_1999",
+        "container-title": "John Soane Architect: Master of Space and Light",
+        "editor": [
+            {
+                "family": "Richardson",
+                "given": "Margaret"
+            },
+            {
+                "family": "Stevens",
+                "given": "Mary Anne"
+            }
+        ],
+        "id": "abramson_bank_1999",
+        "issued": {
+            "date-parts": [
+                [
+                    1999
+                ]
+            ]
+        },
+        "page": "208-251",
+        "publisher": "Royal Academy of Arts",
+        "publisher-place": "London",
+        "title": "Bank of England",
+        "type": "chapter"
+    }
+]
+<<===== INPUT =====<<
diff --git a/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-117.txt b/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-117.txt
new file mode 100644
index 00000000..64e57a17
--- /dev/null
+++ b/tests/fixtures/basic-tests/processor-tests/humans/bugfix-github-117.txt
@@ -0,0 +1,1281 @@
+>>===== MODE =====>>
+bibliography
+<<===== MODE =====<<
+
+>>===== RESULT =====>>
+<div class="csl-bib-body">
+  <div class="csl-entry">Barbier, Frédéric. “L’industrialisation Des Techniques”. In <i>Histoire De l’édition française: Le Temps Des éditeurs; Du Romantisme à La Belle Époque</i>, Roger Chartier and Henri-Jean Martin, 51-66, 1st ed. 1985. Paris: Fayard/Cercle de la Librairie, 1990.</div>
+</div>
+<<===== RESULT =====<<
+
+>>===== CSL =====>>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
+  <info>
+    <title>Chicago Manual of Style 16th edition (full note)</title>
+    <id>http://www.zotero.org/styles/chicago-fullnote-bibliography-16th-edition</id>
+    <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography-16th-edition" rel="self"/>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="translator" form="verb-short">trans.</term>
+      <term name="translator" form="short">trans.</term>
+      <term name="editortranslator" form="verb-short">ed. and trans.</term>
+      <term name="editortranslator" form="verb">Edited and translated by</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="container-author reviewed-author" match="any">
+            <group>
+              <names variable="container-author reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </group>
+      <names variable="editor translator" delimiter=", ">
+        <label form="verb-short" text-case="lowercase" suffix=" "/>
+        <name and="text" delimiter=", "/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-note">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors-note">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" delimiter=", "/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if variable="author">
+              <choose>
+                <if variable="container-author" match="any">
+                  <names variable="container-author">
+                    <label form="verb-short" text-case="lowercase" suffix=" "/>
+                    <name and="text" delimiter=", "/>
+                  </names>
+                </if>
+              </choose>
+              <!--This includes page numers after the container author, e.g. for Introductions -->
+              <choose>
+                <if variable="container-author author" match="all">
+                  <group delimiter=". ">
+                    <text variable="page"/>
+                    <names variable="editor translator" delimiter=", ">
+                      <label form="verb" suffix=" "/>
+                      <name and="text" delimiter=", "/>
+                    </names>
+                  </group>
+                </if>
+                <else>
+                  <names variable="editor translator" delimiter=", ">
+                    <label form="verb" text-case="lowercase" suffix=" "/>
+                    <name and="text" delimiter=", "/>
+                  </names>
+                </else>
+              </choose>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-note">
+    <group delimiter=" ">
+      <names variable="author">
+        <name and="text" sort-separator=", " delimiter=", "/>
+        <label form="short" prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="verb-short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <group delimiter=" ">
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="letter" text-case="capitalize-first"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="contributors">
+    <group delimiter=". ">
+      <names variable="author">
+        <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+        <substitute>
+          <text macro="editor"/>
+          <text macro="translator"/>
+          <choose>
+            <if type="article-magazine article-newspaper webpage post-weblog" match="any">
+              <text variable="container-title"/>
+            </if>
+          </choose>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name form="short" and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <group delimiter=" ">
+      <names variable="author">
+        <name form="short" and="text" delimiter=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+        </substitute>
+      </names>
+      <text macro="recipient-short"/>
+    </group>
+  </macro>
+  <macro name="contributors-sort">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer-note">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if variable="title" match="none">
+        <text variable="genre"/>
+      </if>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group delimiter=" " prefix=", ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <text variable="title" font-style="italic" prefix="review of "/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <group delimiter=", ">
+          <text variable="title" font-style="italic" prefix="Review of "/>
+          <names variable="reviewed-author">
+            <label form="verb-short" text-case="lowercase" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="bill legislation legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="interview">
+            <text term="interview"/>
+          </if>
+          <else-if type="manuscript speech" match="any">
+            <text variable="genre" form="short"/>
+          </else-if>
+          <else-if type="personal_communication">
+            <text macro="issued"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="book graphic motion_picture song" match="any">
+        <text variable="title" text-case="title" form="short" font-style="italic"/>
+      </else-if>
+      <else-if type="legal_case" variable="title-short" match="all">
+        <text variable="title" font-style="italic" form="short"/>
+      </else-if>
+      <else-if type="patent interview" match="any">
+        <text variable="title" form="short"/>
+      </else-if>
+      <else-if type="legal_case bill legislation" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-disambiguate">
+    <choose>
+      <if disambiguate="true">
+        <text macro="issued"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="description-note">
+    <group delimiter=", ">
+      <text macro="interviewer-note"/>
+      <text variable="medium"/>
+      <choose>
+        <if variable="title" match="none"/>
+        <else-if type="manuscript thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
+        <else>
+          <text variable="genre"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="description">
+    <group delimiter=", ">
+      <group delimiter=". ">
+        <text macro="interviewer"/>
+        <text variable="medium" text-case="capitalize-first"/>
+      </group>
+      <choose>
+        <if variable="title" match="none"/>
+        <else-if type="thesis speech" match="any"/>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="authority"/>
+            <text variable="number"/>
+          </group>
+        </else-if>
+        <else>
+          <text variable="genre" text-case="capitalize-first"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-title-note">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+          <text term="in"/>
+        </if>
+      </choose>
+      <choose>
+        <if type="bill legislation legal_case" match="none">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <group delimiter=" ">
+      <choose>
+        <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+          <text term="in" text-case="capitalize-first"/>
+        </if>
+      </choose>
+      <choose>
+        <if type="bill legislation legal_case" match="none">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal">
+        <choose>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-title-journal">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=" ">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition-note">
+    <choose>
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" suffix="."/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note-join-with-space">
+    <choose>
+      <if type="article-journal" variable="volume" match="all">
+        <choose>
+          <if match="none" variable="collection-title">
+            <text macro="locators-note"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-note-join-with-comma">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="locators-note"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume" match="none">
+            <text macro="locators-note"/>
+          </if>
+          <else-if match="any" variable="collection-title">
+            <text macro="locators-note"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-note">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", ">
+          <text macro="collection-title-journal"/>
+          <number variable="volume"/>
+          <group delimiter=" ">
+            <text term="issue" form="short"/>
+            <number variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+      <else-if type="book chapter graphic motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition-note"/>
+          <group delimiter=" ">
+            <text term="volume" form="short"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <choose>
+            <if variable="locator" match="none">
+              <group delimiter=" ">
+                <number variable="number-of-volumes" form="numeric"/>
+                <text term="volume" form="short" plural="true"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="legal-cites">
+    <choose>
+      <if type="legal_case" match="any">
+        <group delimiter=" ">
+          <choose>
+            <if variable="container-title">
+              <text variable="volume"/>
+              <text variable="container-title"/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <text variable="page"/>
+            </if>
+            <else>
+              <text variable="number" prefix="No. "/>
+            </else>
+          </choose>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if variable="number">
+              <!--There's a public law number-->
+              <text variable="number" prefix="Pub. L. No. "/>
+              <group delimiter=" ">
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <text variable="page-first"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text variable="volume"/>
+                <text variable="container-title"/>
+                <!--change to label variable="section" as that becomes available -->
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-join-with-space">
+    <choose>
+      <if type="article-journal" variable="volume" match="all">
+        <choose>
+          <if match="none" variable="collection-title">
+            <text macro="locators"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-join-with-comma">
+    <choose>
+      <if type="bill chapter legislation legal_case paper-conference" match="any">
+        <text macro="locators"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume" match="none">
+            <text macro="locators"/>
+          </if>
+          <else-if match="any" variable="collection-title">
+            <text macro="locators"/>
+          </else-if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-join-with-period">
+    <choose>
+      <if type="bill legislation legal_case article-journal chapter paper-conference" match="none">
+        <text macro="locators"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=", ">
+          <text macro="collection-title-journal"/>
+          <number variable="volume"/>
+          <group delimiter=" ">
+            <text term="issue" form="short"/>
+            <number variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill legislation legal_case" match="any">
+        <text macro="legal-cites"/>
+      </else-if>
+      <else-if type="book graphic motion_picture report song" match="any">
+        <group delimiter=". ">
+          <text macro="edition"/>
+          <group delimiter=" ">
+            <text term="volume" form="short" text-case="capitalize-first"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group delimiter=" ">
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" plural="true"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <group delimiter=". ">
+          <text macro="edition"/>
+          <choose>
+            <if variable="page" match="none">
+              <group delimiter=" ">
+                <text term="volume" form="short" text-case="capitalize-first"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="event-note">
+    <text variable="event"/>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="title">
+        <group delimiter=" ">
+          <choose>
+            <if variable="genre">
+              <text term="presented at"/>
+            </if>
+            <else>
+              <text term="presented at" text-case="capitalize-first"/>
+            </else>
+          </choose>
+          <text variable="event"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <text term="presented at" text-case="capitalize-first"/>
+          <text variable="event"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="originally-published">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="original-publisher-place"/>
+        <text variable="original-publisher"/>
+      </group>
+      <date variable="original-date" form="text" date-parts="year"/>
+    </group>
+  </macro>
+  <macro name="reprint-note">
+    <!--needs localization-->
+    <choose>
+      <if variable="original-date issued" match="all">
+        <choose>
+          <!--for whatever reason in notes, when we have both original and new publishers, reprint doesn't appear-->
+          <if variable="original-publisher original-publisher-place" match="none">
+            <text value="repr."/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="reprint">
+    <!--needs localization-->
+    <choose>
+      <if variable="original-date issued" match="all">
+        <text value="reprint" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <text variable="publisher"/>
+      </if>
+      <else-if type="speech">
+        <text variable="event-place"/>
+      </else-if>
+      <else>
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <choose>
+          <if type="graphic report" match="any">
+            <date variable="issued" form="text"/>
+          </if>
+          <else-if type="legal_case">
+            <group delimiter=" ">
+              <text variable="authority"/>
+              <choose>
+                <if variable="container-title" match="any">
+                  <!--Only print year for cases published in reporters-->
+                  <date variable="issued" form="numeric" date-parts="year"/>
+                </if>
+                <else>
+                  <date variable="issued" form="text"/>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+          <else-if type="book bill chapter graphic legislation motion_picture paper-conference report song thesis" match="any">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <!--Needs Localization-->
+                <text value="filed"/>
+                <date variable="submitted" form="text"/>
+              </group>
+              <group delimiter=" ">
+                <choose>
+                  <if variable="issued submitted" match="all">
+                    <text term="and"/>
+                  </if>
+                </choose>
+                <!--Needs Localization-->
+                <text value="issued"/>
+                <date variable="issued" form="text"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <date variable="issued" form="text"/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else-if variable="accessed URL" match="all"/>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators-subsequent">
+    <choose>
+      <if type="legal_case" variable="locator" match="all">
+        <choose>
+          <if locator="page">
+            <group delimiter=":">
+              <number variable="volume"/>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <label variable="locator" form="short"/>
+              <text variable="locator"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <group delimiter=" ">
+              <choose>
+                <if type="book graphic motion_picture report song" match="any">
+                  <choose>
+                    <if variable="volume">
+                      <group delimiter=", ">
+                        <group delimiter=" ">
+                          <text term="volume" form="short"/>
+                          <number variable="volume" form="numeric"/>
+                        </group>
+                        <label variable="locator" form="short"/>
+                      </group>
+                    </if>
+                    <else>
+                      <label variable="locator" form="short"/>
+                    </else>
+                  </choose>
+                </if>
+                <else>
+                  <label variable="locator" form="short"/>
+                </else>
+              </choose>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else-if type="book graphic motion_picture report song" match="any">
+            <group delimiter=":">
+              <number variable="volume" form="numeric"/>
+              <text variable="locator"/>
+            </group>
+          </else-if>
+          <else>
+            <text variable="locator"/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators-join-with-colon">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="locator page" match="any">
+            <choose>
+              <if variable="volume issue" match="any">
+                <text macro="point-locators"/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="point-locators-join-with-comma">
+    <choose>
+      <if type="article-journal" match="none">
+        <text macro="point-locators"/>
+      </if>
+      <else-if variable="volume issue" match="none">
+        <text macro="point-locators"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator" match="none">
+        <choose>
+          <if type="article-journal chapter paper-conference" match="any">
+            <text variable="page"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="article-journal">
+        <group delimiter=" ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short" suffix=" "/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case"/>
+      <else>
+        <group delimiter=" ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short"/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if variable="author container-author" match="all"/>
+          <else>
+            <choose>
+              <if variable="page">
+                <number variable="volume" suffix=":"/>
+                <text variable="page"/>
+              </if>
+            </choose>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-journal-join-with-colon">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text variable="page"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="archive-note">
+    <choose>
+      <if type="thesis">
+        <group delimiter=" ">
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="archive_location"/>
+          <text variable="archive"/>
+          <text variable="archive-place"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <choose>
+      <if type="thesis">
+        <group delimiter=" ">
+          <text variable="archive"/>
+          <text variable="archive_location" prefix="(" suffix=")"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=". ">
+          <text variable="archive_location" text-case="capitalize-first"/>
+          <text variable="archive"/>
+          <text variable="archive-place"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue-note-join-with-space">
+    <choose>
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="any">
+        <!--Chicago doesn't use publisher/place for Newspapers and we want the date delimited by a comma-->
+        <choose>
+          <if type="article-newspaper" match="none">
+            <choose>
+              <if type="article-journal" match="none">
+                <text macro="issue-note"/>
+              </if>
+              <else-if variable="issue volume" match="any">
+                <text macro="issue-note"/>
+              </else-if>
+            </choose>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue-note-join-with-comma">
+    <choose>
+      <if type="article-journal bill legislation legal_case manuscript thesis" variable="publisher-place publisher" match="none">
+        <text macro="issue-note"/>
+      </if>
+      <else-if type="article-newspaper">
+        <text macro="issue-note"/>
+      </else-if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="none">
+            <text macro="issue-note"/>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="bill legislation legal_case" match="any">
+        <text macro="issued" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text macro="issued" prefix="(" suffix=")"/>
+          </if>
+          <else>
+            <text macro="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="article-newspaper">
+        <text macro="issued"/>
+      </else-if>
+      <else-if variable="publisher-place event-place publisher genre" match="any">
+        <group prefix="(" suffix=")" delimiter=", ">
+          <choose>
+            <if variable="title" match="none"/>
+            <else-if type="manuscript thesis speech" match="any">
+              <text variable="genre"/>
+            </else-if>
+          </choose>
+          <text macro="event-note"/>
+          <group delimiter="; ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint-note"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue-join-with-period">
+    <choose>
+      <if type="article-journal bill legislation legal_case" match="none">
+        <choose>
+          <if type="speech" variable="publisher publisher-place" match="any">
+            <text macro="issue"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue-join-with-comma">
+    <choose>
+      <if type="bill legislation legal_case" match="none">
+        <choose>
+          <if type="article-journal" match="none">
+            <choose>
+              <if type="speech" variable="publisher publisher-place" match="none">
+                <text macro="issue"/>
+              </if>
+            </choose>
+          </if>
+          <else-if variable="volume issue" match="none">
+            <text macro="issue"/>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="bill legislation legal_case" match="any">
+        <text macro="issued" prefix="(" suffix=")"/>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="issue volume" match="any">
+            <text macro="issued" prefix="(" suffix=")"/>
+          </if>
+          <else>
+            <text macro="issued"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="title" match="none"/>
+              <else>
+                <text variable="genre" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <text macro="event"/>
+          </group>
+          <text variable="event-place"/>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <!--Chicago doesn't use publisher/place for Newspapers -->
+      <else-if type="article-newspaper">
+        <text macro="issued"/>
+      </else-if>
+      <else-if variable="publisher-place publisher" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <group delimiter=". ">
+            <text macro="originally-published"/>
+            <group delimiter=", ">
+              <text macro="reprint"/>
+              <text macro="publisher"/>
+            </group>
+          </group>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive-note"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive-note"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="doi:"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="doi:"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="case-locator-subsequent">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <text variable="volume"/>
+          <text variable="container-title"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="case-pinpoint-subsequent">
+    <choose>
+      <if type="legal_case">
+        <group delimiter=" ">
+          <choose>
+            <if locator="page">
+              <text term="at"/>
+              <text variable="locator"/>
+            </if>
+            <else>
+              <label variable="locator"/>
+              <text variable="locator"/>
+            </else>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+    <sort>
+      <key macro="contributors-sort"/>
+      <key variable="title"/>
+      <key variable="genre"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <group delimiter=": ">
+          <group delimiter=". ">
+            <group delimiter=" ">
+                <group delimiter=", ">
+                <group delimiter=". ">
+                    <group delimiter=". ">
+                    <text macro="contributors"/>
+                    <text macro="title"/>
+                    </group>
+                    <text macro="description"/>
+                    <text macro="secondary-contributors"/>
+                    <group delimiter=", ">
+                    <text macro="container-title"/>
+                    <text macro="container-contributors"/>
+                    </group>
+                    <text macro="locators-join-with-period"/>
+                </group>
+                <text macro="locators-join-with-comma"/>
+                <text macro="locators-chapter"/>
+                </group>
+                <text macro="locators-join-with-space"/>
+            </group>
+          <text macro="collection-title"/>
+          <text macro="issue-join-with-period"/>
+        </group>
+          <text macro="locators-journal-join-with-colon"/>
+        </group>
+        <text macro="access"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
+<<===== CSL =====<<
+
+>>===== INPUT =====>>
+[
+    {
+        "author": [
+            {
+                "family": "Barbier",
+                "given": "Frédéric"
+            }
+        ],
+        "citation-label": "barbier_lindustrialisation_1990",
+        "container-author": [
+            {
+                "family": "Chartier",
+                "given": "Roger"
+            },
+            {
+                "family": "Martin",
+                "given": "Henri-Jean"
+            }
+        ],
+        "container-title": "Histoire de l’édition française: Le temps des éditeurs; Du romantisme à la Belle Époque",
+        "edition": "1st ed. 1985",
+        "id": "barbier_lindustrialisation_1990",
+        "issued": {
+            "date-parts": [
+                [
+                    1990
+                ]
+            ]
+        },
+        "page": "51-66",
+        "publisher": "Fayard/Cercle de la Librairie",
+        "publisher-place": "Paris",
+        "title": "L’industrialisation des techniques",
+        "type": "chapter",
+        "volume": "3"
+    }
+]
+<<===== INPUT =====<<
diff --git a/tests/src/BugfixTest.php b/tests/src/BugfixTest.php
index 816aac93..95eb5457 100644
--- a/tests/src/BugfixTest.php
+++ b/tests/src/BugfixTest.php
@@ -7,15 +7,13 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc;
+namespace Seboettg\CiteProc\Test;
 
 use PHPUnit\Framework\TestCase;
+use Seboettg\CiteProc\CiteProc;
+use Seboettg\CiteProc\Exception\CiteProcException;
+use Seboettg\CiteProc\StyleSheet;
 
-/**
- * Class BugfixTest
- * @package Seboettg\CiteProc
- * @author Sebastian Böttger <seboettg@gmail.com>
- */
 class BugfixTest extends TestCase
 {
 
@@ -57,7 +55,7 @@ public function testBugfixGithub50()
     }
 
     /**
-     * @throws Exception\CiteProcException
+     * @throws CiteProcException
      */
     public function testBugfixGithub58()
     {
@@ -72,7 +70,7 @@ public function testBugfixGithub58()
     }
 
     /**
-     * @throws Exception\CiteProcException
+     * @throws CiteProcException
      */
     public function testBugfixGithub59()
     {
@@ -150,4 +148,14 @@ public function testBugfixGithub106()
     {
         $this->runTestSuite('bugfix-github-106');
     }
+
+    public function testBugfixGithub116()
+    {
+        $this->runTestSuite('bugfix-github-116');
+    }
+
+    public function testBugfixGithub117()
+    {
+        $this->runTestSuite('bugfix-github-117');
+    }
 }
diff --git a/tests/src/CiteProcTest.php b/tests/src/CiteProcTest.php
index e0d0be64..b0fd1564 100644
--- a/tests/src/CiteProcTest.php
+++ b/tests/src/CiteProcTest.php
@@ -7,9 +7,12 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc;
+namespace Seboettg\CiteProc\Test;
 
 use PHPUnit\Framework\TestCase;
+use Seboettg\CiteProc\CiteProc;
+use Seboettg\CiteProc\Exception\CiteProcException;
+use Seboettg\CiteProc\StyleSheet;
 
 class CiteProcTest extends TestCase
 {
@@ -61,6 +64,9 @@ public function testRenderCitationNumber()
         $this->runTestSuite("text_renderCitationNumber");
     }
 
+    /**
+     * @throws CiteProcException
+     */
     public function testRenderCssStyle()
     {
         $style = StyleSheet::loadStyleSheet("international-journal-of-humanoid-robotics");
@@ -71,6 +77,9 @@ public function testRenderCssStyle()
         $this->assertTrue(strpos($cssStyles, "csl-right-inline") !== false);
     }
 
+    /**
+     * @throws CiteProcException
+     */
     public function testRenderCssStyleHangingIndent()
     {
         $style = StyleSheet::loadStyleSheet("din-1505-2");
@@ -80,6 +89,9 @@ public function testRenderCssStyleHangingIndent()
         $this->assertTrue(strpos($cssStyles, "text-indent: -2em") !== false);
     }
 
+    /**
+     * @throws CiteProcException
+     */
     public function testRenderCssStyleLineAndEntrySpacing()
     {
         $style = StyleSheet::loadStyleSheet("harvard-north-west-university");
@@ -90,6 +102,9 @@ public function testRenderCssStyleLineAndEntrySpacing()
         $this->assertTrue(strpos($cssStyles, "padding-left: 2em") !== false);
     }
 
+    /**
+     * @throws CiteProcException
+     */
     public function testGetInfo()
     {
         $style = StyleSheet::loadStyleSheet("harvard-north-west-university");
@@ -100,6 +115,9 @@ public function testGetInfo()
         $this->assertEquals("North-West University - Harvard", $info->getTitle());
     }
 
+    /**
+     * @throws CiteProcException
+     */
     public function testFilterCitations()
     {
         $style = StyleSheet::loadStyleSheet("harvard-north-west-university");
@@ -167,6 +185,9 @@ public function testFilterCitations()
     }
 
 
+    /**
+     * @throws CiteProcException
+     */
     public function testRenderCitationNumberResultAsArray()
     {
         $style = StyleSheet::loadStyleSheet("elsevier-vancouver");
diff --git a/tests/src/ContextTest.php b/tests/src/ContextTest.php
index 758eff48..5fb96268 100644
--- a/tests/src/ContextTest.php
+++ b/tests/src/ContextTest.php
@@ -7,10 +7,14 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc;
+namespace Seboettg\CiteProc\Test;
 
 use PHPUnit\Framework\TestCase;
+use Seboettg\CiteProc\CiteProc;
+use Seboettg\CiteProc\Context;
 use Seboettg\CiteProc\Data\DataList;
+use Seboettg\CiteProc\Exception\CiteProcException;
+use Seboettg\CiteProc\StyleSheet;
 
 class ContextTest extends TestCase
 {
@@ -28,6 +32,9 @@ class ContextTest extends TestCase
      */
     private $context;
 
+    /**
+     * @throws CiteProcException
+     */
     public function setUp(): void
     {
         $style = StyleSheet::loadStyleSheet("din-1505-2");
diff --git a/tests/src/Locale/LocaleTest.php b/tests/src/Locale/LocaleTest.php
index d17febfe..27d3fac3 100644
--- a/tests/src/Locale/LocaleTest.php
+++ b/tests/src/Locale/LocaleTest.php
@@ -7,13 +7,11 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Locale;
+namespace Seboettg\CiteProc\Test\Locale;
 
 use PHPUnit\Framework\TestCase;
+use Seboettg\CiteProc\Locale\Locale;
 
-/**
- * Generated by PHPUnit_SkeletonGenerator 1.2.0 on 2012-12-02 at 13:29:49.
- */
 class LocaleTest extends TestCase
 {
     /**
diff --git a/tests/src/LocatorTest.php b/tests/src/LocatorTest.php
index 8ed37e01..b26da3f9 100644
--- a/tests/src/LocatorTest.php
+++ b/tests/src/LocatorTest.php
@@ -5,7 +5,7 @@
  * created at 07.04.20, 18:49
  */
 
-namespace Seboettg\CiteProc;
+namespace Seboettg\CiteProc\Test;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/src/Rendering/Choose/ChooseIfTest.php b/tests/src/Rendering/Choose/ChooseIfTest.php
new file mode 100644
index 00000000..d18779c3
--- /dev/null
+++ b/tests/src/Rendering/Choose/ChooseIfTest.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ * citeproc-php
+ *
+ * @link        http://github.com/seboettg/citeproc-php for the source repository
+ * @copyright   Copyright (c) 2022 Sebastian Böttger.
+ * @license     https://opensource.org/licenses/MIT
+ */
+
+namespace Seboettg\CiteProc\Test\Rendering\Choose;
+
+use Exception;
+use PHPUnit\Framework\TestCase;
+use Seboettg\CiteProc\CiteProc;
+use Seboettg\CiteProc\Context;
+use Seboettg\CiteProc\Exception\ClassNotFoundException;
+use Seboettg\CiteProc\Exception\InvalidStylesheetException;
+use Seboettg\CiteProc\Rendering\Choose\Choose;
+use SimpleXMLElement;
+
+class ChooseIfTest extends TestCase
+{
+
+    /**
+     * @throws ClassNotFoundException
+     * @throws InvalidStylesheetException
+     * @throws Exception
+     */
+    public function testIfShouldConsiderConstraintsFromBothTypeAndVariable()
+    {
+        $csl = <<<EOT
+            <choose>
+                <if type="speech" variable="publisher publisher-place" match="none">
+                    <text value="true"/>
+                </if>
+                <else>
+                    <text value="false"/>
+                </else>
+            </choose>
+        EOT;
+
+        $dataString = <<<EOT
+            {
+                "type": "speech",
+                "publisher": "Publisher",
+                "publisher-place": "Frankfurt"
+            }
+        EOT;
+        $this->mockContext();
+        $expectedResult = "false"; // since match="none"
+        $choose = new Choose(new SimpleXMLElement($csl), null);
+        $this->assertEquals($expectedResult, $choose->render(json_decode($dataString)));
+    }
+
+    private function mockContext(): void
+    {
+        $mockedContext = $this->createMock(Context::class);
+        $mockedContext
+            ->method('isModeBibliography')
+            ->willReturn(true);
+        $mockedContext
+            ->method('isModeCitation')
+            ->willReturn(false);
+        $mockedContext
+            ->method('getMode')
+            ->willReturn('bibliography');
+        $mockedContext
+            ->method('getMarkupExtension')
+            ->willReturn([]);
+
+        CiteProc::setContext($mockedContext);
+    }
+}
diff --git a/tests/src/Rendering/Choose/ChooseTest.php b/tests/src/Rendering/Choose/ChooseTest.php
index 95b673c7..941ea8a8 100644
--- a/tests/src/Rendering/Choose/ChooseTest.php
+++ b/tests/src/Rendering/Choose/ChooseTest.php
@@ -7,7 +7,7 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Node\Choose\Choose;
+namespace Seboettg\CiteProc\Test\Rendering\Choose;
 
 use PHPUnit\Framework\TestCase;
 use Seboettg\CiteProc\CiteProc;
@@ -15,7 +15,7 @@
 use Seboettg\CiteProc\Exception\ClassNotFoundException;
 use Seboettg\CiteProc\Exception\InvalidStylesheetException;
 use Seboettg\CiteProc\Rendering\Choose\Choose;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 use SimpleXMLElement;
 
 class ChooseTest extends TestCase
diff --git a/tests/src/Rendering/Date/DateTest.php b/tests/src/Rendering/Date/DateTest.php
index fb7681b8..717b14b7 100644
--- a/tests/src/Rendering/Date/DateTest.php
+++ b/tests/src/Rendering/Date/DateTest.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * citeproc-php
  *
  * @link        http://github.com/seboettg/citeproc-php for the source repository
@@ -7,10 +7,10 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering\Date;
+namespace Seboettg\CiteProc\Test\Rendering\Date;
 
 use PHPUnit\Framework\TestCase;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 class DateTest extends TestCase
 {
diff --git a/tests/src/Rendering/GroupTest.php b/tests/src/Rendering/GroupTest.php
index b1523a04..ce48cd21 100644
--- a/tests/src/Rendering/GroupTest.php
+++ b/tests/src/Rendering/GroupTest.php
@@ -7,13 +7,17 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering;
+namespace Seboettg\CiteProc\Test\Rendering;
 
+use Exception;
 use PHPUnit\Framework\TestCase;
 use Seboettg\CiteProc\CiteProc;
 use Seboettg\CiteProc\Context;
+use Seboettg\CiteProc\Exception\InvalidStylesheetException;
 use Seboettg\CiteProc\Locale\Locale;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Rendering\Group;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
+use SimpleXMLElement;
 
 class GroupTest extends TestCase
 {
@@ -29,24 +33,36 @@ public function setUp(): void
         CiteProc::setContext($context);
     }
 
+    /**
+     * @throws InvalidStylesheetException
+     * @throws Exception
+     */
     public function testRenderDelimiter()
     {
         $str = '<group delimiter=" "><text term="retrieved"/><text term="from"/><text variable="URL"/></group>';
-        $group = new Group(new \SimpleXMLElement($str), null);
+        $group = new Group(new SimpleXMLElement($str), null);
         $this->assertEquals("abgerufen von http://foo.bar", $group->render(json_decode($this->data)));
     }
 
+    /**
+     * @throws InvalidStylesheetException
+     * @throws Exception
+     */
     public function testRenderAffixes()
     {
         $str = '<group prefix="[" suffix="]" delimiter=" "><text term="retrieved"/><text term="from"/><text variable="URL"/></group>';
-        $group = new Group(new \SimpleXMLElement($str), null);
+        $group = new Group(new SimpleXMLElement($str), null);
         $this->assertEquals("[abgerufen von http://foo.bar]", $group->render(json_decode($this->data)));
     }
 
+    /**
+     * @throws InvalidStylesheetException
+     * @throws Exception
+     */
     public function testRenderDisplay()
     {
         $str = '<group display="indent" prefix="[" suffix="]" delimiter=" "><text term="retrieved"/><text term="from"/><text variable="URL"/></group>';
-        $group = new Group(new \SimpleXMLElement($str), null);
+        $group = new Group(new SimpleXMLElement($str), null);
         $this->assertEquals("<div class=\"csl-indent\">[abgerufen von http://foo.bar]</div>", $group->render(json_decode($this->data)));
     }
 
diff --git a/tests/src/Rendering/LabelTest.php b/tests/src/Rendering/LabelTest.php
index 25e77872..d736efa6 100644
--- a/tests/src/Rendering/LabelTest.php
+++ b/tests/src/Rendering/LabelTest.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * citeproc-php
  *
  * @link        http://github.com/seboettg/citeproc-php for the source repository
@@ -7,9 +7,10 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering;
+namespace Seboettg\CiteProc\Test\Rendering;
+
 use PHPUnit\Framework\TestCase;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 class LabelTest extends TestCase
 {
diff --git a/tests/src/Rendering/Name/NameTest.php b/tests/src/Rendering/Name/NameTest.php
index 1f087e0f..e7329478 100644
--- a/tests/src/Rendering/Name/NameTest.php
+++ b/tests/src/Rendering/Name/NameTest.php
@@ -7,12 +7,12 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering\Name;
+namespace Seboettg\CiteProc\Test\Rendering\Name;
 
 use PHPUnit\Framework\TestCase;
 use Seboettg\CiteProc\CiteProc;
 use Seboettg\CiteProc\StyleSheet;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 class NameTest extends TestCase
 {
diff --git a/tests/src/Rendering/Name/NameorderTest.php b/tests/src/Rendering/Name/NameorderTest.php
index eeeb8a55..3601860f 100644
--- a/tests/src/Rendering/Name/NameorderTest.php
+++ b/tests/src/Rendering/Name/NameorderTest.php
@@ -7,16 +7,11 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering\Name;
+namespace Seboettg\CiteProc\Test\Rendering\Name;
 
 use PHPUnit\Framework\TestCase;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
-/**
- * Class NameDemoteNonDroppingParticleTest
- * @package src\Seboettg\CiteProc\Rendering\Name
- * @author Sebastian Böttger <seboettg@gmail.com>
- */
 class NameorderTest extends TestCase
 {
     use TestSuiteTestCaseTrait;
diff --git a/tests/src/Rendering/Name/NamesTest.php b/tests/src/Rendering/Name/NamesTest.php
index d4c10533..835e4342 100644
--- a/tests/src/Rendering/Name/NamesTest.php
+++ b/tests/src/Rendering/Name/NamesTest.php
@@ -7,10 +7,21 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering\Names;
+namespace Seboettg\CiteProc\Test\Rendering\Name;
 
+use Exception;
 use PHPUnit\Framework\TestCase;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\CiteProc;
+use Seboettg\CiteProc\Context;
+use Seboettg\CiteProc\Exception\CiteProcException;
+use Seboettg\CiteProc\Exception\InvalidStylesheetException;
+use Seboettg\CiteProc\Locale\Locale;
+use Seboettg\CiteProc\Rendering\Name\Names;
+use Seboettg\CiteProc\Style\Options\DemoteNonDroppingParticle;
+use Seboettg\CiteProc\Style\Options\GlobalOptions;
+use Seboettg\CiteProc\Style\Options\PageRangeFormats;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
+use SimpleXMLElement;
 
 class NamesTest extends TestCase
 {
@@ -43,4 +54,145 @@ public function testEtAlWithCombined()
         //$this->_testRenderTestSuite("name_EtAlWithCombined");
     }
     */
+
+    /**
+     * @throws Exception
+     */
+    public function testRenderLabelBeforeNameShouldBeTrueIfLabelTagBeforeName()
+    {
+        $csl = <<<EOD
+            <names variable="translator">
+              <label form="verb-short" prefix=", "/>
+              <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+            </names>
+        EOD;
+        CiteProc::setContext(new Context());
+        $style = new SimpleXMLElement($csl);
+        $names = new Names($style, null);
+        $this->assertTrue($names->isRenderLabelBeforeName());
+    }
+
+    /**
+     * @throws InvalidStylesheetException
+     * @throws Exception
+     */
+    public function testRenderLabelBeforeNameShouldBeFalseIfLabelTagAfterName()
+    {
+        $csl = <<<EOD
+            <names variable="translator">
+              <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="verb-short" prefix=", "/>
+            </names>
+        EOD;
+        CiteProc::setContext(new Context());
+        $style = new SimpleXMLElement($csl);
+        $names = new Names($style, null);
+        $this->assertFalse($names->isRenderLabelBeforeName());
+    }
+
+    /**
+     * @throws CiteProcException
+     * @throws InvalidStylesheetException
+     * @throws Exception
+     */
+    public function testLabelShouldAppearAfterNameIfLabelTagAfterNameTag()
+    {
+        $csl = <<<EOD
+            <names variable="translator">
+              <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+              <label form="verb-short" prefix=", " />
+            </names>
+        EOD;
+        $data = <<<EOD
+              {
+                "type": "book",
+                "issued": {
+                    "date-parts": [
+                        [
+                            1546
+                        ]
+                    ]
+                },
+                "publisher": "Jaques Kerver",
+                "translator": [
+                    {
+                        "given": "Jean",
+                        "family": "Martin"
+                    }
+                ]
+              }
+            EOD;
+        $expectedResult = "Jean Martin, trans. by";
+        $this->mockContext();
+
+        $style = new SimpleXMLElement($csl);
+        $names = new Names($style, null);
+        $actualResult = $names->render(json_decode($data));
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+
+    /**
+     * @throws CiteProcException
+     * @throws InvalidStylesheetException
+     * @throws Exception
+     */
+    public function testLabelShouldAppearBeforeNameIfLabelTagBeforeNameTag()
+    {
+        $csl = <<<EOD
+            <names variable="translator">
+              <label form="verb-short" prefix=", " />
+              <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+            </names>
+        EOD;
+        $data = <<<EOD
+              {
+                "type": "book",
+                "issued": {
+                    "date-parts": [
+                        [
+                            1546
+                        ]
+                    ]
+                },
+                "publisher": "Jaques Kerver",
+                "translator": [
+                    {
+                        "given": "Jean",
+                        "family": "Martin"
+                    }
+                ]
+              }
+            EOD;
+        $expectedResult = ", trans. by Jean Martin";
+        $this->mockContext();
+
+        $style = new SimpleXMLElement($csl);
+        $names = new Names($style, null);
+        $actualResult = $names->render(json_decode($data));
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+
+    private function mockContext()
+    {
+        $globalOptionsMock = $this->createMock(GlobalOptions::class);
+        $globalOptionsMock
+            ->method('getDemoteNonDroppingParticles')
+            ->willReturn(DemoteNonDroppingParticle::NEVER());
+        $globalOptionsMock
+            ->method('getPageRangeFormat')
+            ->willReturn(PageRangeFormats::CHICAGO());
+        $globalOptionsMock
+            ->method('isInitializeWithHyphen')
+            ->willReturn(false);
+
+        $stub = $this->createMock(Context::class);
+        $stub
+            ->method('getGlobalOptions')
+            ->willReturn($globalOptionsMock);
+
+        $context = new Context();
+        $context->setLocale(new Locale());
+        $context->setGlobalOptions($globalOptionsMock);
+        CiteProc::setContext($context);
+    }
 }
diff --git a/tests/src/Rendering/Name/SubstituteTest.php b/tests/src/Rendering/Name/SubstituteTest.php
index 99e59948..06de3282 100644
--- a/tests/src/Rendering/Name/SubstituteTest.php
+++ b/tests/src/Rendering/Name/SubstituteTest.php
@@ -7,10 +7,10 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering\Name;
+namespace Seboettg\CiteProc\Test\Rendering\Name;
 
 use PHPUnit\Framework\TestCase;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 
 class SubstituteTest extends TestCase
diff --git a/tests/src/Rendering/NumberTest.php b/tests/src/Rendering/NumberTest.php
index a70d5329..5d2a79f3 100644
--- a/tests/src/Rendering/NumberTest.php
+++ b/tests/src/Rendering/NumberTest.php
@@ -7,13 +7,14 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering;
+namespace Seboettg\CiteProc\Test\Rendering;
 
 use PHPUnit\Framework\TestCase;
 use Seboettg\CiteProc\Locale\Locale;
 use Seboettg\CiteProc\CiteProc;
 use Seboettg\CiteProc\Context;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Rendering\Number;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 class NumberTest extends TestCase
 {
diff --git a/tests/src/Rendering/TextTest.php b/tests/src/Rendering/TextTest.php
index c407cfe4..16d70e04 100644
--- a/tests/src/Rendering/TextTest.php
+++ b/tests/src/Rendering/TextTest.php
@@ -7,12 +7,12 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering;
+namespace Seboettg\CiteProc\Test\Rendering;
 
 use PHPUnit\Framework\TestCase;
 use Seboettg\CiteProc\CiteProc;
 use Seboettg\CiteProc\StyleSheet;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 class TextTest extends TestCase
 {
diff --git a/tests/src/Style/MacroTest.php b/tests/src/Style/MacroTest.php
index 410f2f23..eeb5a1ae 100644
--- a/tests/src/Style/MacroTest.php
+++ b/tests/src/Style/MacroTest.php
@@ -7,7 +7,7 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Rendering;
+namespace Seboettg\CiteProc\Test\Rendering;
 
 use PHPUnit\Framework\TestCase;
 use Seboettg\CiteProc\CiteProc;
diff --git a/tests/src/Style/Sort/SortTest.php b/tests/src/Style/Sort/SortTest.php
index 9d4b46fe..f046e768 100644
--- a/tests/src/Style/Sort/SortTest.php
+++ b/tests/src/Style/Sort/SortTest.php
@@ -7,11 +7,11 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Style\Sort;
+namespace Seboettg\CiteProc\Test\Style\Sort;
 
 use PHPUnit\Framework\TestCase;
 use Seboettg\CiteProc\CiteProc;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 class SortTest extends TestCase
 {
diff --git a/tests/src/StyleSheetTest.php b/tests/src/StyleSheetTest.php
index 5cd1073c..b1374254 100644
--- a/tests/src/StyleSheetTest.php
+++ b/tests/src/StyleSheetTest.php
@@ -7,9 +7,12 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc;
+namespace Seboettg\CiteProc\Test;
 
+use Exception;
 use PHPUnit\Framework\TestCase;
+use Seboettg\CiteProc\Exception\CiteProcException;
+use Seboettg\CiteProc\StyleSheet;
 use SimpleXMLElement;
 
 class StyleSheetTest extends TestCase
@@ -17,7 +20,8 @@ class StyleSheetTest extends TestCase
 
     /**
      * @coversNothing
-     * @throws Exception\CiteProcException
+     * @throws CiteProcException
+     * @throws Exception
      */
     public function testLoadStyleSheet()
     {
@@ -39,7 +43,8 @@ public function testLoadStyleSheet()
 
     /**
      * @coversNothing
-     * @throws Exception\CiteProcException
+     * @throws CiteProcException
+     * @throws Exception
      */
     public function testLoadLocales()
     {
@@ -62,6 +67,7 @@ public function testLoadLocales()
 
     /**
      * @coversNothing
+     * @throws CiteProcException
      */
     public function testLoadLocalesMetadata()
     {
@@ -73,6 +79,8 @@ public function testLoadLocalesMetadata()
 
     /**
      * @coversNothing
+     * @throws CiteProcException
+     * @throws Exception
      */
     public function testLoadPrimaryDialectLocale()
     {
diff --git a/tests/src/Styles/AffixesTest.php b/tests/src/Styles/AffixesTest.php
index 50209ebc..a72310f4 100644
--- a/tests/src/Styles/AffixesTest.php
+++ b/tests/src/Styles/AffixesTest.php
@@ -7,10 +7,10 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Styles;
+namespace Seboettg\CiteProc\Test\Styles;
 
 use PHPUnit\Framework\TestCase;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 class AffixesTest extends TestCase
 {
diff --git a/tests/src/Styles/DisplayTest.php b/tests/src/Styles/DisplayTest.php
index 41151e8e..5fa9fed0 100644
--- a/tests/src/Styles/DisplayTest.php
+++ b/tests/src/Styles/DisplayTest.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * citeproc-php
  *
  * @link        http://github.com/seboettg/citeproc-php for the source repository
@@ -7,10 +7,10 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Styles;
+namespace Seboettg\CiteProc\Test\Styles;
 
 use PHPUnit\Framework\TestCase;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
 
 class DisplayTest extends TestCase
 {
diff --git a/tests/src/TestSuiteTestCaseTrait.php b/tests/src/TestSuiteTestCaseTrait.php
index 72920d89..072e2c2d 100644
--- a/tests/src/TestSuiteTestCaseTrait.php
+++ b/tests/src/TestSuiteTestCaseTrait.php
@@ -7,11 +7,12 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc;
+namespace Seboettg\CiteProc\Test;
 
 use Exception;
 use PHPUnit\Framework\ExpectationFailedException;
 use RuntimeException;
+use Seboettg\CiteProc\CiteProc;
 use Seboettg\CiteProc\Exception\CiteProcException;
 
 trait TestSuiteTestCaseTrait
diff --git a/tests/src/Util/NumberHelperTest.php b/tests/src/Util/NumberHelperTest.php
index 09bd1902..ecf1f8b6 100644
--- a/tests/src/Util/NumberHelperTest.php
+++ b/tests/src/Util/NumberHelperTest.php
@@ -7,9 +7,10 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Util;
+namespace Seboettg\CiteProc\Test\Util;
 
 use PHPUnit\Framework\TestCase;
+use Seboettg\CiteProc\Util\NumberHelper;
 
 class NumberHelperTest extends TestCase
 {
diff --git a/tests/src/Util/PageHelperTest.php b/tests/src/Util/PageHelperTest.php
index 92483a87..78531472 100644
--- a/tests/src/Util/PageHelperTest.php
+++ b/tests/src/Util/PageHelperTest.php
@@ -7,11 +7,12 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Util;
+namespace Seboettg\CiteProc\Test\Util;
 
 use PHPUnit\Framework\TestCase;
 use Seboettg\CiteProc\Style\Options\PageRangeFormats;
-use Seboettg\CiteProc\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Test\TestSuiteTestCaseTrait;
+use Seboettg\CiteProc\Util\PageHelper;
 
 class PageHelperTest extends TestCase
 {
diff --git a/tests/src/Util/StringHelperTest.php b/tests/src/Util/StringHelperTest.php
index d53dfa9a..3d07f641 100644
--- a/tests/src/Util/StringHelperTest.php
+++ b/tests/src/Util/StringHelperTest.php
@@ -7,16 +7,11 @@
  * @license     https://opensource.org/licenses/MIT
  */
 
-namespace Seboettg\CiteProc\Util;
+namespace Seboettg\CiteProc\Test\Util;
 
 use PHPUnit\Framework\TestCase;
+use Seboettg\CiteProc\Util\StringHelper;
 
-/**
- * Class StringHelper
- * @package src\Seboettg\CiteProc\Util
- *
- * @author Sebastian Böttger <boettger@hebis.uni-frankfurt.de>
- */
 class StringHelperTest extends TestCase
 {
     public function testCamelCase2Hyphen()