diff --git a/composer.json b/composer.json
index 8b315d0..ed7cdd8 100644
--- a/composer.json
+++ b/composer.json
@@ -9,11 +9,11 @@
     }
   ],
   "require": {
-    "php": ">=5.6.0",
+    "php": ">=7.4",
     "packaged/helpers": "^1.0||^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.8.0",
+    "phpunit/phpunit": "~8.0",
     "satooshi/php-coveralls": "~1.0.0"
   },
   "autoload": {
diff --git a/phpunit.xml b/phpunit.xml
index 1e16849..4d4e3ad 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -8,10 +8,9 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
   <testsuites>
-    <testsuite>
+    <testsuite name="tests">
       <directory>tests</directory>
     </testsuite>
   </testsuites>
diff --git a/src/Assembler/MySQL/MySQLAssembler.php b/src/Assembler/MySQL/MySQLAssembler.php
index 96e2b03..1ed740a 100644
--- a/src/Assembler/MySQL/MySQLAssembler.php
+++ b/src/Assembler/MySQL/MySQLAssembler.php
@@ -32,7 +32,7 @@ public function assembleField(FieldExpression $field)
     if($field->hasTable())
     {
       return $this->assembleTableExpression($field->getTable())
-      . '.' . $this->escapeField($field->getField());
+        . '.' . $this->escapeField($field->getField());
     }
     else
     {
@@ -42,6 +42,10 @@ public function assembleField(FieldExpression $field)
 
   public function assembleTableExpression(TableExpression $expr)
   {
+    if($expr->getDatabase())
+    {
+      return $this->escapeField($expr->getDatabase()) . '.' . $this->escapeField($expr->getTableName());
+    }
     return $this->escapeField($expr->getTableName());
   }
 
diff --git a/src/Assembler/QueryAssembler.php b/src/Assembler/QueryAssembler.php
index f26cfcf..dcb9b16 100644
--- a/src/Assembler/QueryAssembler.php
+++ b/src/Assembler/QueryAssembler.php
@@ -169,6 +169,6 @@ public function escapeField($field)
 
   public function escapeValue($value)
   {
-    return '"' . addcslashes($value, '"') . '"';
+    return $value ? '"' . addcslashes($value, '"') . '"' : '""';
   }
 }
diff --git a/src/Expression/TableExpression.php b/src/Expression/TableExpression.php
index ea8d923..7d05cf6 100644
--- a/src/Expression/TableExpression.php
+++ b/src/Expression/TableExpression.php
@@ -4,6 +4,21 @@
 class TableExpression implements IExpression
 {
   protected $_table;
+  protected $_database;
+
+  /**
+   * @return string|null
+   */
+  public function getDatabase()
+  {
+    return $this->_database;
+  }
+
+  public function setDatabase($database)
+  {
+    $this->_database = $database;
+    return $this;
+  }
 
   public function setTableName($table)
   {
@@ -18,11 +33,12 @@ public function getTableName()
 
   /**
    * @param $table
+   * @param $database
    *
-   * @return static
+   * @return \Packaged\QueryBuilder\Expression\TableExpression
    */
-  public static function create($table)
+  public static function create($table, $database = null)
   {
-    return (new static)->setTableName($table);
+    return (new static())->setTableName($table)->setDatabase($database);
   }
 }
diff --git a/tests/Assembler/AssemblerTest.php b/tests/Assembler/AssemblerTest.php
index 0670a4c..a09bb6d 100644
--- a/tests/Assembler/AssemblerTest.php
+++ b/tests/Assembler/AssemblerTest.php
@@ -14,8 +14,9 @@
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 use Packaged\QueryBuilder\Statement\IStatement;
 use Packaged\QueryBuilder\Statement\QueryStatement;
+use PHPUnit\Framework\TestCase;
 
-class AssemblerTest extends \PHPUnit_Framework_TestCase
+class AssemblerTest extends TestCase
 {
   /**
    * @expectedException \Exception
@@ -46,9 +47,9 @@ public function testAssemblerPrepare()
       [
         'AND' => [
           EqualPredicate::create('field2', null),
-          NotEqualPredicate::create('field3', null)
+          NotEqualPredicate::create('field3', null),
         ],
-        'OR'  => BetweenPredicate::create('field4', 123, 456)
+        'OR'  => BetweenPredicate::create('field4', 123, 456),
       ]
     );
     $assembler = new QueryAssembler($stm, true);
@@ -114,7 +115,7 @@ public function testInPredicate()
       )
     );
 
-    $this->setExpectedException(
+    $this->expectException(
       '\Packaged\QueryBuilder\Exceptions\Assembler\QueryBuilderAssemblerException',
       'Cannot assemble an empty ArrayExpression'
     );
diff --git a/tests/Assembler/CQL/CqlAssemblerTest.php b/tests/Assembler/CQL/CqlAssemblerTest.php
index 327232b..902f560 100644
--- a/tests/Assembler/CQL/CqlAssemblerTest.php
+++ b/tests/Assembler/CQL/CqlAssemblerTest.php
@@ -15,8 +15,9 @@
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\CountSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
+use PHPUnit\Framework\TestCase;
 
-class CqlAssemblerTest extends \PHPUnit_Framework_TestCase
+class CqlAssemblerTest extends TestCase
 {
   public function testBetween()
   {
diff --git a/tests/Assembler/MySQL/MySQLAssemblerTest.php b/tests/Assembler/MySQL/MySQLAssemblerTest.php
index c922275..b2dad34 100644
--- a/tests/Assembler/MySQL/MySQLAssemblerTest.php
+++ b/tests/Assembler/MySQL/MySQLAssemblerTest.php
@@ -11,8 +11,9 @@
 use Packaged\QueryBuilder\SelectExpression\MatchSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\MaxSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\SubQuerySelectExpression;
+use PHPUnit\Framework\TestCase;
 
-class MySQLAssemblerTest extends \PHPUnit_Framework_TestCase
+class MySQLAssemblerTest extends TestCase
 {
   public function testTableName()
   {
@@ -28,6 +29,12 @@ public function testTableName()
         TableExpression::create('mytable')
       )
     );
+    $this->assertEquals(
+      '`mydb`.`mytable`',
+      MySQLAssembler::stringify(
+        TableExpression::create('mytable', 'mydb')
+      )
+    );
   }
 
   public function testFieldName()
diff --git a/tests/Builder/Expect/QueryBuilderDeleteTest.php b/tests/Builder/Expect/QueryBuilderDeleteTest.php
index e93f6a1..ec9a583 100644
--- a/tests/Builder/Expect/QueryBuilderDeleteTest.php
+++ b/tests/Builder/Expect/QueryBuilderDeleteTest.php
@@ -3,8 +3,9 @@
 
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Builder\QueryBuilder;
+use PHPUnit\Framework\TestCase;
 
-class QueryBuilderDeleteTest extends \PHPUnit_Framework_TestCase
+class QueryBuilderDeleteTest extends TestCase
 {
   public function testDelete()
   {
diff --git a/tests/Builder/Expect/QueryBuilderSelectTest.php b/tests/Builder/Expect/QueryBuilderSelectTest.php
index 0c7ecd1..51d5440 100644
--- a/tests/Builder/Expect/QueryBuilderSelectTest.php
+++ b/tests/Builder/Expect/QueryBuilderSelectTest.php
@@ -3,8 +3,9 @@
 
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Builder\QueryBuilder;
+use PHPUnit\Framework\TestCase;
 
-class QueryBuilderSelectTest extends \PHPUnit_Framework_TestCase
+class QueryBuilderSelectTest extends TestCase
 {
   public function testSelect()
   {
diff --git a/tests/Builder/Traits/GroupByTraitTest.php b/tests/Builder/Traits/GroupByTraitTest.php
index 1a81b1a..357ee27 100644
--- a/tests/Builder/Traits/GroupByTraitTest.php
+++ b/tests/Builder/Traits/GroupByTraitTest.php
@@ -5,8 +5,9 @@
 use Packaged\QueryBuilder\Builder\Traits\GroupByTrait;
 use Packaged\QueryBuilder\Clause\GroupByClause;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
+use PHPUnit\Framework\TestCase;
 
-class GroupByTraitTest extends \PHPUnit_Framework_TestCase
+class GroupByTraitTest extends TestCase
 {
   public function testCreate()
   {
diff --git a/tests/Builder/Traits/JoinTraitTest.php b/tests/Builder/Traits/JoinTraitTest.php
index 1f00ba0..ac0ac55 100644
--- a/tests/Builder/Traits/JoinTraitTest.php
+++ b/tests/Builder/Traits/JoinTraitTest.php
@@ -12,7 +12,7 @@
 use Packaged\QueryBuilder\SelectExpression\TableSelectExpression;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class JoinTraitTest extends \PHPUnit_Framework_TestCase
+class JoinTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testCreate()
   {
diff --git a/tests/Builder/Traits/LimitTraitTest.php b/tests/Builder/Traits/LimitTraitTest.php
index 7aaf22e..5c32d3c 100644
--- a/tests/Builder/Traits/LimitTraitTest.php
+++ b/tests/Builder/Traits/LimitTraitTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Builder\Traits\LimitTrait;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class LimitTraitTest extends \PHPUnit_Framework_TestCase
+class LimitTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testCreate()
   {
diff --git a/tests/Builder/Traits/OrderByTraitTest.php b/tests/Builder/Traits/OrderByTraitTest.php
index bc462e6..459e11f 100644
--- a/tests/Builder/Traits/OrderByTraitTest.php
+++ b/tests/Builder/Traits/OrderByTraitTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Clause\OrderByClause;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class OrderByTraitTest extends \PHPUnit_Framework_TestCase
+class OrderByTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testCreate()
   {
diff --git a/tests/Builder/Traits/TableTraitTest.php b/tests/Builder/Traits/TableTraitTest.php
index 9cc5d63..efbd0bd 100644
--- a/tests/Builder/Traits/TableTraitTest.php
+++ b/tests/Builder/Traits/TableTraitTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\SelectExpression\TableSelectExpression;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class TableTraitTest extends \PHPUnit_Framework_TestCase
+class TableTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testGetTable()
   {
diff --git a/tests/Builder/Traits/WhereTraitTest.php b/tests/Builder/Traits/WhereTraitTest.php
index 55657eb..69b9a45 100644
--- a/tests/Builder/Traits/WhereTraitTest.php
+++ b/tests/Builder/Traits/WhereTraitTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Builder\Traits\WhereTrait;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class WhereTraitTest extends \PHPUnit_Framework_TestCase
+class WhereTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testCreate()
   {
@@ -35,7 +35,7 @@ public function testCreate()
   public function testException()
   {
     $class = new FinalWhereTrait();
-    $this->setExpectedException(
+    $this->expectException(
       'RuntimeException',
       'You can only use andWhere and orWhere after specifying a where clause'
     );
diff --git a/tests/Clause/AbstractFieldClauseTest.php b/tests/Clause/AbstractFieldClauseTest.php
index 56d52a0..04ebb43 100644
--- a/tests/Clause/AbstractFieldClauseTest.php
+++ b/tests/Clause/AbstractFieldClauseTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Clause\AbstractFieldClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class AbstractFieldClauseTest extends \PHPUnit_Framework_TestCase
+class AbstractFieldClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/AbstractPredicateClauseTest.php b/tests/Clause/AbstractPredicateClauseTest.php
index a6dc39a..6ae1293 100644
--- a/tests/Clause/AbstractPredicateClauseTest.php
+++ b/tests/Clause/AbstractPredicateClauseTest.php
@@ -7,13 +7,13 @@
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 use Packaged\QueryBuilder\Predicate\NotEqualPredicate;
 
-class AbstractPredicateClauseTest extends \PHPUnit_Framework_TestCase
+class AbstractPredicateClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testGettersAndSetters()
   {
     $clause = new FinalAbstractPredicateClause();
-    $eq     = new EqualPredicate();
-    $neq    = new NotEqualPredicate();
+    $eq = new EqualPredicate();
+    $neq = new NotEqualPredicate();
 
     $this->assertFalse($clause->hasPredicates());
     $clause->addPredicate($eq);
@@ -27,14 +27,14 @@ public function testGettersAndSetters()
     $clause->clearPredicates();
     $this->assertFalse($clause->hasPredicates());
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $clause->setPredicates([$eq, $neq, 'abc']);
   }
 
   public function testAssemble()
   {
     $clause = new FinalAbstractPredicateClause();
-    $eq     = new EqualPredicate();
+    $eq = new EqualPredicate();
     $string = (new StringExpression())->setValue('val');
     $eq->setField('one')->setExpression($string);
     $neq = new NotEqualPredicate();
diff --git a/tests/Clause/AbstractTableClauseTest.php b/tests/Clause/AbstractTableClauseTest.php
index e984d62..459aded 100644
--- a/tests/Clause/AbstractTableClauseTest.php
+++ b/tests/Clause/AbstractTableClauseTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Clause\AbstractTableClause;
 use Packaged\QueryBuilder\Clause\IClause;
 
-class AbstractTableClauseTest extends \PHPUnit_Framework_TestCase
+class AbstractTableClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testGettersAndSetters()
   {
@@ -53,4 +53,4 @@ public function getAction()
   public function allowMultiple()
   {
   }
-}
\ No newline at end of file
+}
diff --git a/tests/Clause/DeleteClauseTest.php b/tests/Clause/DeleteClauseTest.php
index ed7e141..78b5bc3 100644
--- a/tests/Clause/DeleteClauseTest.php
+++ b/tests/Clause/DeleteClauseTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Clause\DeleteClause;
 
-class DeleteClauseTest extends \PHPUnit_Framework_TestCase
+class DeleteClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/DuplicateKeyClauseTest.php b/tests/Clause/DuplicateKeyClauseTest.php
index 9d6da77..c6e9841 100644
--- a/tests/Clause/DuplicateKeyClauseTest.php
+++ b/tests/Clause/DuplicateKeyClauseTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 
-class DuplicateKeyClauseTest extends \PHPUnit_Framework_TestCase
+class DuplicateKeyClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testDuplicateKey()
   {
diff --git a/tests/Clause/FromClauseTest.php b/tests/Clause/FromClauseTest.php
index eeb9765..94971e3 100644
--- a/tests/Clause/FromClauseTest.php
+++ b/tests/Clause/FromClauseTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\SelectExpression\CountSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\SubQuerySelectExpression;
 
-class FromClauseTest extends \PHPUnit_Framework_TestCase
+class FromClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/GroupByClauseTest.php b/tests/Clause/GroupByClauseTest.php
index 7dbe860..8e616cd 100644
--- a/tests/Clause/GroupByClauseTest.php
+++ b/tests/Clause/GroupByClauseTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Clause\GroupByClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class GroupByClauseTest extends \PHPUnit_Framework_TestCase
+class GroupByClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/HavingClauseTest.php b/tests/Clause/HavingClauseTest.php
index 2798171..78c4853 100644
--- a/tests/Clause/HavingClauseTest.php
+++ b/tests/Clause/HavingClauseTest.php
@@ -8,7 +8,7 @@
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 use Packaged\QueryBuilder\Predicate\GreaterThanPredicate;
 
-class HavingClauseTest extends \PHPUnit_Framework_TestCase
+class HavingClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/InsertClauseTest.php b/tests/Clause/InsertClauseTest.php
index 037f50d..98bbf40 100644
--- a/tests/Clause/InsertClauseTest.php
+++ b/tests/Clause/InsertClauseTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Clause\InsertClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class InsertClauseTest extends \PHPUnit_Framework_TestCase
+class InsertClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
@@ -43,7 +43,7 @@ public function testGettersAndSetters()
     $clause->clearFields();
     $this->assertFalse($clause->hasFields());
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $clause->setFields([$nameField, $idField, 'abc']);
   }
 }
diff --git a/tests/Clause/LimitClauseTest.php b/tests/Clause/LimitClauseTest.php
index c3145bd..aa9c4ab 100644
--- a/tests/Clause/LimitClauseTest.php
+++ b/tests/Clause/LimitClauseTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 
-class LimitClauseTest extends \PHPUnit_Framework_TestCase
+class LimitClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/OrderByClauseTest.php b/tests/Clause/OrderByClauseTest.php
index 01ff00b..6415da0 100644
--- a/tests/Clause/OrderByClauseTest.php
+++ b/tests/Clause/OrderByClauseTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\SelectExpression\CustomSelectExpression;
 
-class OrderByClauseTest extends \PHPUnit_Framework_TestCase
+class OrderByClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/ReplaceClauseTest.php b/tests/Clause/ReplaceClauseTest.php
index 7a0e0a4..1c08198 100644
--- a/tests/Clause/ReplaceClauseTest.php
+++ b/tests/Clause/ReplaceClauseTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Clause\ReplaceClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class ReplaceClauseTest extends \PHPUnit_Framework_TestCase
+class ReplaceClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
@@ -43,7 +43,7 @@ public function testGettersAndSetters()
     $clause->clearFields();
     $this->assertFalse($clause->hasFields());
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $clause->setFields([$nameField, $idField, 'abc']);
   }
 }
diff --git a/tests/Clause/SelectClauseTest.php b/tests/Clause/SelectClauseTest.php
index b2161ff..761e434 100644
--- a/tests/Clause/SelectClauseTest.php
+++ b/tests/Clause/SelectClauseTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\NowSelectExpression;
 
-class SelectClauseTest extends \PHPUnit_Framework_TestCase
+class SelectClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
@@ -71,7 +71,7 @@ public function testAssemble()
       QueryAssembler::stringify($clause)
     );
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $clause->addField(new \stdClass());
   }
 
@@ -93,7 +93,7 @@ public function testGettersAndSetters()
     $clause->clearExpressions();
     $this->assertFalse($clause->hasExpressions());
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $clause->setExpressions([$field, $now, 'abc']);
   }
 
diff --git a/tests/Clause/SetClauseTest.php b/tests/Clause/SetClauseTest.php
index 90db39b..108d8a9 100644
--- a/tests/Clause/SetClauseTest.php
+++ b/tests/Clause/SetClauseTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 
-class SetClauseTest extends \PHPUnit_Framework_TestCase
+class SetClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/UpdateClauseTest.php b/tests/Clause/UpdateClauseTest.php
index 06879c2..52a4d3e 100644
--- a/tests/Clause/UpdateClauseTest.php
+++ b/tests/Clause/UpdateClauseTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Clause\UpdateClause;
 
-class UpdateClauseTest extends \PHPUnit_Framework_TestCase
+class UpdateClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Clause/ValuesClauseTest.php b/tests/Clause/ValuesClauseTest.php
index bb0b9ab..011bde6 100644
--- a/tests/Clause/ValuesClauseTest.php
+++ b/tests/Clause/ValuesClauseTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Expression\ValueExpression;
 
-class ValuesClauseTest extends \PHPUnit_Framework_TestCase
+class ValuesClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
@@ -44,7 +44,7 @@ public function testGettersAndSetters()
     $clause->clearExpressions();
     $this->assertFalse($clause->hasExpressions());
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $clause->setExpressions([$field, $null, 'abc']);
   }
 }
diff --git a/tests/Clause/WhereClauseTest.php b/tests/Clause/WhereClauseTest.php
index 941a5fc..209fe1a 100644
--- a/tests/Clause/WhereClauseTest.php
+++ b/tests/Clause/WhereClauseTest.php
@@ -10,7 +10,7 @@
 use Packaged\QueryBuilder\Predicate\GreaterThanPredicate;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
 
-class WhereClauseTest extends \PHPUnit_Framework_TestCase
+class WhereClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/AbstractArithmeticExpressionTest.php b/tests/Expression/AbstractArithmeticExpressionTest.php
index efccb00..3cca3a4 100644
--- a/tests/Expression/AbstractArithmeticExpressionTest.php
+++ b/tests/Expression/AbstractArithmeticExpressionTest.php
@@ -8,7 +8,7 @@
 use Packaged\QueryBuilder\Expression\IExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
 
-class AbstractArithmeticExpressionTest extends \PHPUnit_Framework_TestCase
+class AbstractArithmeticExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/ArithmeticTest.php b/tests/Expression/ArithmeticTest.php
index 28472dd..5f7f119 100644
--- a/tests/Expression/ArithmeticTest.php
+++ b/tests/Expression/ArithmeticTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\SubtractExpression;
 use Packaged\QueryBuilder\SelectExpression\SumSelectExpression;
 
-class ArithmeticTest extends \PHPUnit_Framework_TestCase
+class ArithmeticTest extends \PHPUnit\Framework\TestCase
 {
   public function testArithmetic()
   {
diff --git a/tests/Expression/BooleanExpressionTest.php b/tests/Expression/BooleanExpressionTest.php
index 43b83e3..3ac979b 100644
--- a/tests/Expression/BooleanExpressionTest.php
+++ b/tests/Expression/BooleanExpressionTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\BooleanExpression;
 use Packaged\QueryBuilder\Expression\ValueExpression;
 
-class BooleanExpressionTest extends \PHPUnit_Framework_TestCase
+class BooleanExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testBoolean()
   {
diff --git a/tests/Expression/CQL/ListExpressionTest.php b/tests/Expression/CQL/ListExpressionTest.php
index 5e06d68..f8783fc 100644
--- a/tests/Expression/CQL/ListExpressionTest.php
+++ b/tests/Expression/CQL/ListExpressionTest.php
@@ -8,7 +8,7 @@
 use Packaged\QueryBuilder\Expression\SubtractExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 
-class ListExpressionTest extends \PHPUnit_Framework_TestCase
+class ListExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testListExpression()
   {
diff --git a/tests/Expression/CQL/MapExpressionTest.php b/tests/Expression/CQL/MapExpressionTest.php
index 31a5b0b..a198464 100644
--- a/tests/Expression/CQL/MapExpressionTest.php
+++ b/tests/Expression/CQL/MapExpressionTest.php
@@ -9,7 +9,7 @@
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 
-class MapExpressionTest extends \PHPUnit_Framework_TestCase
+class MapExpressionTest extends \PHPUnit\Framework\TestCase
 {
   /**
    * @expectedException \InvalidArgumentException
diff --git a/tests/Expression/CQL/SetExpressionTest.php b/tests/Expression/CQL/SetExpressionTest.php
index 2272393..36c3835 100644
--- a/tests/Expression/CQL/SetExpressionTest.php
+++ b/tests/Expression/CQL/SetExpressionTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\CQL\SetExpression;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class SetExpressionTest extends \PHPUnit_Framework_TestCase
+class SetExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testSetExpression()
   {
diff --git a/tests/Expression/CaseExpressionTest.php b/tests/Expression/CaseExpressionTest.php
index 6ebf6b9..b70ee52 100644
--- a/tests/Expression/CaseExpressionTest.php
+++ b/tests/Expression/CaseExpressionTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Expression\CaseExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 
-class CaseExpressionTest extends \PHPUnit_Framework_TestCase
+class CaseExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testCaseExpression()
   {
diff --git a/tests/Expression/DecrementExpressionTest.php b/tests/Expression/DecrementExpressionTest.php
index 4c3fead..7617d1f 100644
--- a/tests/Expression/DecrementExpressionTest.php
+++ b/tests/Expression/DecrementExpressionTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Expression\DecrementExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
 
-class DecrementExpressionTest extends \PHPUnit_Framework_TestCase
+class DecrementExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/DivisionExpressionTest.php b/tests/Expression/DivisionExpressionTest.php
index 363e43d..9987344 100644
--- a/tests/Expression/DivisionExpressionTest.php
+++ b/tests/Expression/DivisionExpressionTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
 
-class DivisionExpressionTest extends \PHPUnit_Framework_TestCase
+class DivisionExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/FieldExpressionTest.php b/tests/Expression/FieldExpressionTest.php
index 7379875..1a21c95 100644
--- a/tests/Expression/FieldExpressionTest.php
+++ b/tests/Expression/FieldExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class FieldExpressionTest extends \PHPUnit_Framework_TestCase
+class FieldExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/IfExpressionTest.php b/tests/Expression/IfExpressionTest.php
index 0dd20ad..3dac2dc 100644
--- a/tests/Expression/IfExpressionTest.php
+++ b/tests/Expression/IfExpressionTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Expression\IfExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 
-class IfExpressionTest extends \PHPUnit_Framework_TestCase
+class IfExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testIfExpression()
   {
diff --git a/tests/Expression/IncrementExpressionTest.php b/tests/Expression/IncrementExpressionTest.php
index b086939..b73588f 100644
--- a/tests/Expression/IncrementExpressionTest.php
+++ b/tests/Expression/IncrementExpressionTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\Expression\IncrementExpression;
 
-class IncrementExpressionTest extends \PHPUnit_Framework_TestCase
+class IncrementExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/MatchExpressionTest.php b/tests/Expression/MatchExpressionTest.php
index 09c6f75..415f881 100644
--- a/tests/Expression/MatchExpressionTest.php
+++ b/tests/Expression/MatchExpressionTest.php
@@ -9,7 +9,7 @@
 use Packaged\QueryBuilder\Predicate\GreaterThanPredicate;
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 
-class MatchExpressionTest extends \PHPUnit_Framework_TestCase
+class MatchExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/MultiplyExpressionTest.php b/tests/Expression/MultiplyExpressionTest.php
index 91f9fd4..baa5e06 100644
--- a/tests/Expression/MultiplyExpressionTest.php
+++ b/tests/Expression/MultiplyExpressionTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\MultiplyExpression;
 use Packaged\QueryBuilder\Expression\NumericExpression;
 
-class MultiplyExpressionTest extends \PHPUnit_Framework_TestCase
+class MultiplyExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/NowExpressionTest.php b/tests/Expression/NowExpressionTest.php
index eb4f9e2..a298436 100644
--- a/tests/Expression/NowExpressionTest.php
+++ b/tests/Expression/NowExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Expression\NowExpression;
 
-class NowExpressionTest extends \PHPUnit_Framework_TestCase
+class NowExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/NumericExpressionTest.php b/tests/Expression/NumericExpressionTest.php
index 5fbdbea..5022739 100644
--- a/tests/Expression/NumericExpressionTest.php
+++ b/tests/Expression/NumericExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Expression\NumericExpression;
 
-class NumericExpressionTest extends \PHPUnit_Framework_TestCase
+class NumericExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/StringExpressionTest.php b/tests/Expression/StringExpressionTest.php
index 557835a..9b317cb 100644
--- a/tests/Expression/StringExpressionTest.php
+++ b/tests/Expression/StringExpressionTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Expression\StringExpression;
 
-class StringExpressionTest extends \PHPUnit_Framework_TestCase
+class StringExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/UnixTimestampExpressionTest.php b/tests/Expression/UnixTimestampExpressionTest.php
index 7742d65..5cb5f48 100644
--- a/tests/Expression/UnixTimestampExpressionTest.php
+++ b/tests/Expression/UnixTimestampExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Expression\UnixTimestampExpression;
 
-class UnixTimestampExpressionTest extends \PHPUnit_Framework_TestCase
+class UnixTimestampExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Expression/ValueExpressionTest.php b/tests/Expression/ValueExpressionTest.php
index c4514c2..8c78f6f 100644
--- a/tests/Expression/ValueExpressionTest.php
+++ b/tests/Expression/ValueExpressionTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Builder\QueryBuilder;
 use Packaged\QueryBuilder\Expression\ValueExpression;
 
-class ValueExpressionTest extends \PHPUnit_Framework_TestCase
+class ValueExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/AbstractOperatorPredicateTest.php b/tests/Predicate/AbstractOperatorPredicateTest.php
index 6c0ffe1..6dfe632 100644
--- a/tests/Predicate/AbstractOperatorPredicateTest.php
+++ b/tests/Predicate/AbstractOperatorPredicateTest.php
@@ -9,7 +9,7 @@
 use Packaged\QueryBuilder\Predicate\AbstractOperatorPredicate;
 use Packaged\QueryBuilder\Predicate\IPredicate;
 
-class AbstractOperatorPredicateTest extends \PHPUnit_Framework_TestCase
+class AbstractOperatorPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
@@ -66,4 +66,4 @@ public function getOperator()
 
 class UnknownPredicate implements IPredicate
 {
-}
\ No newline at end of file
+}
diff --git a/tests/Predicate/BetweenPredicateTest.php b/tests/Predicate/BetweenPredicateTest.php
index 4025047..7c5c04f 100644
--- a/tests/Predicate/BetweenPredicateTest.php
+++ b/tests/Predicate/BetweenPredicateTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\BetweenPredicate;
 
-class BetweenPredicateTest extends \PHPUnit_Framework_TestCase
+class BetweenPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/EqualPredicateTest.php b/tests/Predicate/EqualPredicateTest.php
index 6efda1f..97f89ff 100644
--- a/tests/Predicate/EqualPredicateTest.php
+++ b/tests/Predicate/EqualPredicateTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 
-class EqualPredicateTest extends \PHPUnit_Framework_TestCase
+class EqualPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/GreaterThanOrEqualPredicateTest.php b/tests/Predicate/GreaterThanOrEqualPredicateTest.php
index 4dd8dc1..561a2d6 100644
--- a/tests/Predicate/GreaterThanOrEqualPredicateTest.php
+++ b/tests/Predicate/GreaterThanOrEqualPredicateTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\GreaterThanOrEqualPredicate;
 
-class GreaterThanOrEqualPredicateTest extends \PHPUnit_Framework_TestCase
+class GreaterThanOrEqualPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/GreaterThanPredicateTest.php b/tests/Predicate/GreaterThanPredicateTest.php
index 62cfda0..5f30a68 100644
--- a/tests/Predicate/GreaterThanPredicateTest.php
+++ b/tests/Predicate/GreaterThanPredicateTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
 
-class GreaterThanPredicateTest extends \PHPUnit_Framework_TestCase
+class GreaterThanPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/InPredicateTest.php b/tests/Predicate/InPredicateTest.php
index 169d7ea..4e5fd64 100644
--- a/tests/Predicate/InPredicateTest.php
+++ b/tests/Predicate/InPredicateTest.php
@@ -10,7 +10,7 @@
 use Packaged\QueryBuilder\Predicate\InPredicate;
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 
-class InPredicateTest extends \PHPUnit_Framework_TestCase
+class InPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/LessThanOrEqualPredicateTest.php b/tests/Predicate/LessThanOrEqualPredicateTest.php
index d67418e..a58bbc8 100644
--- a/tests/Predicate/LessThanOrEqualPredicateTest.php
+++ b/tests/Predicate/LessThanOrEqualPredicateTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
 
-class LessThanOrEqualPredicateTest extends \PHPUnit_Framework_TestCase
+class LessThanOrEqualPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/LessThanPredicateTest.php b/tests/Predicate/LessThanPredicateTest.php
index 3c0559d..35b2773 100644
--- a/tests/Predicate/LessThanPredicateTest.php
+++ b/tests/Predicate/LessThanPredicateTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
 
-class LessThanPredicateTest extends \PHPUnit_Framework_TestCase
+class LessThanPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/LikeBinaryPredicateTest.php b/tests/Predicate/LikeBinaryPredicateTest.php
index 2c157ea..22973ea 100644
--- a/tests/Predicate/LikeBinaryPredicateTest.php
+++ b/tests/Predicate/LikeBinaryPredicateTest.php
@@ -8,7 +8,7 @@
 use Packaged\QueryBuilder\Expression\Like\StartsWithExpression;
 use Packaged\QueryBuilder\Predicate\LikePredicate;
 
-class LikeBinaryPredicateTest extends \PHPUnit_Framework_TestCase
+class LikeBinaryPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/LikePredicateTest.php b/tests/Predicate/LikePredicateTest.php
index d28de22..3e3c268 100644
--- a/tests/Predicate/LikePredicateTest.php
+++ b/tests/Predicate/LikePredicateTest.php
@@ -9,7 +9,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\LikePredicate;
 
-class LikePredicateTest extends \PHPUnit_Framework_TestCase
+class LikePredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/NotBetweenPredicateTest.php b/tests/Predicate/NotBetweenPredicateTest.php
index 1d1805a..840085a 100644
--- a/tests/Predicate/NotBetweenPredicateTest.php
+++ b/tests/Predicate/NotBetweenPredicateTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\NotBetweenPredicate;
 
-class NotBetweenPredicateTest extends \PHPUnit_Framework_TestCase
+class NotBetweenPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/NotEqualPredicateTest.php b/tests/Predicate/NotEqualPredicateTest.php
index 684d4a3..bc49011 100644
--- a/tests/Predicate/NotEqualPredicateTest.php
+++ b/tests/Predicate/NotEqualPredicateTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
 
-class NotEqualPredicateTest extends \PHPUnit_Framework_TestCase
+class NotEqualPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/NotInPredicateTest.php b/tests/Predicate/NotInPredicateTest.php
index dec2894..9a4ba37 100644
--- a/tests/Predicate/NotInPredicateTest.php
+++ b/tests/Predicate/NotInPredicateTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\Expression\ValueExpression;
 use Packaged\QueryBuilder\Predicate\NotInPredicate;
 
-class NotInPredicateTest extends \PHPUnit_Framework_TestCase
+class NotInPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/NotLikePredicateTest.php b/tests/Predicate/NotLikePredicateTest.php
index ab37c49..161ee43 100644
--- a/tests/Predicate/NotLikePredicateTest.php
+++ b/tests/Predicate/NotLikePredicateTest.php
@@ -9,7 +9,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\NotLikePredicate;
 
-class NotLikePredicateTest extends \PHPUnit_Framework_TestCase
+class NotLikePredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Predicate/PredicateSetTest.php b/tests/Predicate/PredicateSetTest.php
index f1cc682..c79ee5f 100644
--- a/tests/Predicate/PredicateSetTest.php
+++ b/tests/Predicate/PredicateSetTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\Predicate\NotEqualPredicate;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
 
-class PredicateSetTest extends \PHPUnit_Framework_TestCase
+class PredicateSetTest extends \PHPUnit\Framework\TestCase
 {
   public function testGettersAndSetters()
   {
@@ -27,7 +27,7 @@ public function testGettersAndSetters()
     $set->clearPredicates();
     $this->assertFalse($set->hasPredicates());
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $set->setPredicates([$eq, $neq, 'abc']);
   }
 
diff --git a/tests/Predicate/RegexpPredicateTest.php b/tests/Predicate/RegexpPredicateTest.php
index 8d28f5a..31187a4 100644
--- a/tests/Predicate/RegexpPredicateTest.php
+++ b/tests/Predicate/RegexpPredicateTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Predicate\RegexpPredicate;
 
-class RegexpPredicateTest extends \PHPUnit_Framework_TestCase
+class RegexpPredicateTest extends \PHPUnit\Framework\TestCase
 {
   public function testRegexpPredicate()
   {
diff --git a/tests/SelectExpression/AbstractSelectExpressionTest.php b/tests/SelectExpression/AbstractSelectExpressionTest.php
index 89045f2..8a91856 100644
--- a/tests/SelectExpression/AbstractSelectExpressionTest.php
+++ b/tests/SelectExpression/AbstractSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\Segments\SelectExpressionAssembler;
 use Packaged\QueryBuilder\SelectExpression\ISelectExpression;
 
-class AbstractSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class AbstractSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   /**
    * @expectedException \RuntimeException
@@ -19,4 +19,4 @@ public function testUnknown()
 
 class UnknownSelectExpression implements ISelectExpression
 {
-}
\ No newline at end of file
+}
diff --git a/tests/SelectExpression/AllSelectExpressionTest.php b/tests/SelectExpression/AllSelectExpressionTest.php
index ba980b0..a1a4bc7 100644
--- a/tests/SelectExpression/AllSelectExpressionTest.php
+++ b/tests/SelectExpression/AllSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 
-class AllSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class AllSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/AverageSelectExpressionTest.php b/tests/SelectExpression/AverageSelectExpressionTest.php
index f7f2de8..4a130e0 100644
--- a/tests/SelectExpression/AverageSelectExpressionTest.php
+++ b/tests/SelectExpression/AverageSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\AverageSelectExpression;
 
-class AverageSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class AverageSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/CharLengthSelectExpressionTest.php b/tests/SelectExpression/CharLengthSelectExpressionTest.php
index 81a333d..6d82ad6 100644
--- a/tests/SelectExpression/CharLengthSelectExpressionTest.php
+++ b/tests/SelectExpression/CharLengthSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\CharLengthSelectExpression;
 
-class CharLengthSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class CharLengthSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/ConcatSelectExpressionTest.php b/tests/SelectExpression/ConcatSelectExpressionTest.php
index 02c3607..3682d13 100644
--- a/tests/SelectExpression/ConcatSelectExpressionTest.php
+++ b/tests/SelectExpression/ConcatSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\ConcatSelectExpression;
 
-class ConcatSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class ConcatSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/CountSelectExpressionTest.php b/tests/SelectExpression/CountSelectExpressionTest.php
index cad2338..1acac0a 100644
--- a/tests/SelectExpression/CountSelectExpressionTest.php
+++ b/tests/SelectExpression/CountSelectExpressionTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\CountSelectExpression;
 
-class CountSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class CountSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/CustomSelectExpressionTest.php b/tests/SelectExpression/CustomSelectExpressionTest.php
index cfa7b1b..0bbb6e9 100644
--- a/tests/SelectExpression/CustomSelectExpressionTest.php
+++ b/tests/SelectExpression/CustomSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\CustomSelectExpression;
 
-class CustomSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class CustomSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testCustomSelectExpression()
   {
diff --git a/tests/SelectExpression/ExpressionSelectExpressionTest.php b/tests/SelectExpression/ExpressionSelectExpressionTest.php
index 1c3a4f0..d076a7e 100644
--- a/tests/SelectExpression/ExpressionSelectExpressionTest.php
+++ b/tests/SelectExpression/ExpressionSelectExpressionTest.php
@@ -8,7 +8,7 @@
 use Packaged\QueryBuilder\SelectExpression\ExpressionSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\SumSelectExpression;
 
-class ExpressionSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class ExpressionSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testExpressionSelectExpression()
   {
diff --git a/tests/SelectExpression/FieldSelectExpressionTest.php b/tests/SelectExpression/FieldSelectExpressionTest.php
index 8cfa5bd..71dd18c 100644
--- a/tests/SelectExpression/FieldSelectExpressionTest.php
+++ b/tests/SelectExpression/FieldSelectExpressionTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
 
-class FieldSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class FieldSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/FirstSelectExpressionTest.php b/tests/SelectExpression/FirstSelectExpressionTest.php
index 244a0b9..e55b674 100644
--- a/tests/SelectExpression/FirstSelectExpressionTest.php
+++ b/tests/SelectExpression/FirstSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\FirstSelectExpression;
 
-class FirstSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class FirstSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/FormatSelectExpressionTest.php b/tests/SelectExpression/FormatSelectExpressionTest.php
index 165c46b..5d612b4 100644
--- a/tests/SelectExpression/FormatSelectExpressionTest.php
+++ b/tests/SelectExpression/FormatSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\FormatSelectExpression;
 
-class FormatSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class FormatSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/LastSelectExpressionTest.php b/tests/SelectExpression/LastSelectExpressionTest.php
index e84b6b5..e4e98fe 100644
--- a/tests/SelectExpression/LastSelectExpressionTest.php
+++ b/tests/SelectExpression/LastSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\LastSelectExpression;
 
-class LastSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class LastSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/LengthSelectExpressionTest.php b/tests/SelectExpression/LengthSelectExpressionTest.php
index fd3c2a0..0408d31 100644
--- a/tests/SelectExpression/LengthSelectExpressionTest.php
+++ b/tests/SelectExpression/LengthSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\LengthSelectExpression;
 
-class LengthSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class LengthSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/LowerCaseSelectExpressionTest.php b/tests/SelectExpression/LowerCaseSelectExpressionTest.php
index 3648f85..a59b481 100644
--- a/tests/SelectExpression/LowerCaseSelectExpressionTest.php
+++ b/tests/SelectExpression/LowerCaseSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\LowerCaseSelectExpression;
 
-class LowerCaseSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class LowerCaseSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/MatchSelectExpressionTest.php b/tests/SelectExpression/MatchSelectExpressionTest.php
index 4ef873f..fc4de41 100644
--- a/tests/SelectExpression/MatchSelectExpressionTest.php
+++ b/tests/SelectExpression/MatchSelectExpressionTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\SelectExpression\MatchSelectExpression;
 
-class MatchSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class MatchSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/MaxSelectExpressionTest.php b/tests/SelectExpression/MaxSelectExpressionTest.php
index 73f7838..dbbc9ca 100644
--- a/tests/SelectExpression/MaxSelectExpressionTest.php
+++ b/tests/SelectExpression/MaxSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\MaxSelectExpression;
 
-class MaxSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class MaxSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/MinSelectExpressionTest.php b/tests/SelectExpression/MinSelectExpressionTest.php
index 450f8a7..b0806ac 100644
--- a/tests/SelectExpression/MinSelectExpressionTest.php
+++ b/tests/SelectExpression/MinSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\MinSelectExpression;
 
-class MinSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class MinSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/NowSelectExpressionTest.php b/tests/SelectExpression/NowSelectExpressionTest.php
index 4f28df6..0cda61c 100644
--- a/tests/SelectExpression/NowSelectExpressionTest.php
+++ b/tests/SelectExpression/NowSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\NowSelectExpression;
 
-class NowSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class NowSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/ReplaceSelectExpressionTest.php b/tests/SelectExpression/ReplaceSelectExpressionTest.php
index cafc698..eb210ae 100644
--- a/tests/SelectExpression/ReplaceSelectExpressionTest.php
+++ b/tests/SelectExpression/ReplaceSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\ReplaceSelectExpression;
 
-class ReplaceSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class ReplaceSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/SubQuerySelectExpressionTest.php b/tests/SelectExpression/SubQuerySelectExpressionTest.php
index 20959dc..fc0cb11 100644
--- a/tests/SelectExpression/SubQuerySelectExpressionTest.php
+++ b/tests/SelectExpression/SubQuerySelectExpressionTest.php
@@ -8,7 +8,7 @@
 use Packaged\QueryBuilder\SelectExpression\SubQuerySelectExpression;
 use Packaged\QueryBuilder\Statement\QueryStatement;
 
-class SubQuerySelectExpressionTest extends \PHPUnit_Framework_TestCase
+class SubQuerySelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   protected function _basicQuery()
   {
diff --git a/tests/SelectExpression/SubStringSelectExpressionTest.php b/tests/SelectExpression/SubStringSelectExpressionTest.php
index 983ded0..d73012e 100644
--- a/tests/SelectExpression/SubStringSelectExpressionTest.php
+++ b/tests/SelectExpression/SubStringSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\SubStringSelectExpression;
 
-class SubStringSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class SubStringSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/SumSelectExpressionTest.php b/tests/SelectExpression/SumSelectExpressionTest.php
index ae4dc3a..3fba121 100644
--- a/tests/SelectExpression/SumSelectExpressionTest.php
+++ b/tests/SelectExpression/SumSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\SumSelectExpression;
 
-class SumSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class SumSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/TableSelectExpressionTest.php b/tests/SelectExpression/TableSelectExpressionTest.php
index d7e11fe..26e7802 100644
--- a/tests/SelectExpression/TableSelectExpressionTest.php
+++ b/tests/SelectExpression/TableSelectExpressionTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\TableExpression;
 use Packaged\QueryBuilder\SelectExpression\TableSelectExpression;
 
-class TableSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class TableSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/TrimSelectExpressionTest.php b/tests/SelectExpression/TrimSelectExpressionTest.php
index f64c13c..2e73680 100644
--- a/tests/SelectExpression/TrimSelectExpressionTest.php
+++ b/tests/SelectExpression/TrimSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\TrimSelectExpression;
 
-class TrimSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class TrimSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/SelectExpression/UpperCaseSelectExpressionTest.php b/tests/SelectExpression/UpperCaseSelectExpressionTest.php
index b60b798..6ec560a 100644
--- a/tests/SelectExpression/UpperCaseSelectExpressionTest.php
+++ b/tests/SelectExpression/UpperCaseSelectExpressionTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\SelectExpression\UpperCaseSelectExpression;
 
-class UpperCaseSelectExpressionTest extends \PHPUnit_Framework_TestCase
+class UpperCaseSelectExpressionTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Statement/CQL/CqlInsertStatementTest.php b/tests/Statement/CQL/CqlInsertStatementTest.php
index 1f9583f..225636a 100644
--- a/tests/Statement/CQL/CqlInsertStatementTest.php
+++ b/tests/Statement/CQL/CqlInsertStatementTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\CQL\CqlAssembler;
 use Packaged\QueryBuilder\Builder\CQL\CqlQueryBuilder;
 
-class CqlInsertStatementTest extends \PHPUnit_Framework_TestCase
+class CqlInsertStatementTest extends \PHPUnit\Framework\TestCase
 {
   public function testInsert()
   {
diff --git a/tests/Statement/CQL/CqlQueryStatementTest.php b/tests/Statement/CQL/CqlQueryStatementTest.php
index c6e2d36..7a2c1a3 100644
--- a/tests/Statement/CQL/CqlQueryStatementTest.php
+++ b/tests/Statement/CQL/CqlQueryStatementTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Clause\CQL\AllowFilteringClause;
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 
-class CqlQueryStatementTest extends \PHPUnit_Framework_TestCase
+class CqlQueryStatementTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Statement/CQL/CqlUpdateStatementTest.php b/tests/Statement/CQL/CqlUpdateStatementTest.php
index c61d182..33bbeb8 100644
--- a/tests/Statement/CQL/CqlUpdateStatementTest.php
+++ b/tests/Statement/CQL/CqlUpdateStatementTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\DecrementExpression;
 use Packaged\QueryBuilder\Expression\IncrementExpression;
 
-class CqlUpdateStatementTest extends \PHPUnit_Framework_TestCase
+class CqlUpdateStatementTest extends \PHPUnit\Framework\TestCase
 {
   public function testUpdate()
   {
diff --git a/tests/Statement/DeleteStatementTest.php b/tests/Statement/DeleteStatementTest.php
index ab4b7d1..156901f 100644
--- a/tests/Statement/DeleteStatementTest.php
+++ b/tests/Statement/DeleteStatementTest.php
@@ -9,7 +9,7 @@
 use Packaged\QueryBuilder\Predicate\NotEqualPredicate;
 use Packaged\QueryBuilder\Statement\DeleteStatement;
 
-class DeleteStatementTest extends \PHPUnit_Framework_TestCase
+class DeleteStatementTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Statement/InsertStatementTest.php b/tests/Statement/InsertStatementTest.php
index ff5d8f1..8094798 100644
--- a/tests/Statement/InsertStatementTest.php
+++ b/tests/Statement/InsertStatementTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\Expression\IncrementExpression;
 use Packaged\QueryBuilder\Expression\ValueExpression;
 
-class InsertStatementTest extends \PHPUnit_Framework_TestCase
+class InsertStatementTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Statement/QueryStatementTest.php b/tests/Statement/QueryStatementTest.php
index e2f14fc..6846721 100644
--- a/tests/Statement/QueryStatementTest.php
+++ b/tests/Statement/QueryStatementTest.php
@@ -18,7 +18,7 @@
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 use Packaged\QueryBuilder\Statement\QueryStatement;
 
-class QueryStatementTest extends \PHPUnit_Framework_TestCase
+class QueryStatementTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Statement/ReplaceStatementTest.php b/tests/Statement/ReplaceStatementTest.php
index 20e0958..d17af1e 100644
--- a/tests/Statement/ReplaceStatementTest.php
+++ b/tests/Statement/ReplaceStatementTest.php
@@ -8,7 +8,7 @@
 use Packaged\QueryBuilder\Expression\ValueExpression;
 use Packaged\QueryBuilder\Statement\ReplaceStatement;
 
-class ReplaceStatementTest extends \PHPUnit_Framework_TestCase
+class ReplaceStatementTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
diff --git a/tests/Statement/UpdateStatementTest.php b/tests/Statement/UpdateStatementTest.php
index aa52b05..681c7b6 100644
--- a/tests/Statement/UpdateStatementTest.php
+++ b/tests/Statement/UpdateStatementTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\Like\StartsWithExpression;
 use Packaged\QueryBuilder\Predicate\LikePredicate;
 
-class UpdateStatementTest extends \PHPUnit_Framework_TestCase
+class UpdateStatementTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {