diff --git a/bootstrap.php b/bootstrap.php
new file mode 100644
index 0000000..aa28ace
--- /dev/null
+++ b/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+
+require 'JsonSchema.php';
+require 'JsonSchemaUndefined.php';
+require 'tests/BaseTestCase.php';
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..cc5e764
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="bootstrap.php"
+         verbose="true"
+>
+  <testsuites>
+      <testsuite name="JSON Schema Test Suite">
+          <directory suffix="Test.php">tests</directory>
+      </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/tests/AdditionalPropertiesTest.php b/tests/AdditionalPropertiesTest.php
new file mode 100644
index 0000000..ecc3cd0
--- /dev/null
+++ b/tests/AdditionalPropertiesTest.php
@@ -0,0 +1,67 @@
+<?php
+
+class AdditionalPropertiesTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "prop":"1",
+                  "additionalProp":"2"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "prop":{"type":"string"}
+                  },
+                  "additionalProperties": false
+                }'
+            ),
+            array(
+                '{
+                  "prop":"1",
+                  "additionalProp":2
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "prop":{"type":"string"}
+                  },
+                  "additionalProperties": {"type":"string"}
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "prop":"1",
+                  "additionalProp":"2"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "prop":{"type":"string"}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "prop":"1",
+                  "additionalProp":"2"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "prop":{"type":"string"}
+                  },
+                  "additionalProperties": {"type":"string"}
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/ArraysTest.php b/tests/ArraysTest.php
new file mode 100644
index 0000000..0c0a14d
--- /dev/null
+++ b/tests/ArraysTest.php
@@ -0,0 +1,55 @@
+<?php
+
+class ArraysTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "array":[1,2,"a"]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "array":{
+                      "type":"array",
+                      "items":{"type":"number"}
+                    }
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "array":[1,2,null]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "array":{
+                      "type":"array",
+                      "items":{"type":["number","boolean"]}
+                    }
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "array":[1,2,"a"]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "array":{"type":"array"}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
new file mode 100644
index 0000000..8b01a73
--- /dev/null
+++ b/tests/BaseTestCase.php
@@ -0,0 +1,33 @@
+<?php
+
+abstract class BaseTestCase extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider getInvalidTests
+     */
+    public function testInvalidCases($input, $schema, $errors = array())
+    {
+        $result = JsonSchema::validate(json_decode($input), json_decode($schema));
+        if (array() !== $errors) {
+            $this->assertEquals($errors, $result->errors);
+        }
+        $this->assertFalse($result->valid, var_export($result, true));
+    }
+    
+    /**
+     * @dataProvider getValidTests
+     */
+    public function testValidCases($input, $schema, $checkMode = null)
+    {    
+        if (null === $checkMode) {
+            $checkMode = JsonSchema::CHECK_MODE_NORMAL;
+        }
+        JsonSchema::$checkMode = $checkMode;
+        $result = JsonSchema::validate(json_decode($input), json_decode($schema));
+        $this->assertTrue($result->valid, var_export($result, true));
+    }
+    
+    abstract public function getValidTests();
+    
+    abstract public function getInvalidTests();
+}
\ No newline at end of file
diff --git a/tests/BasicTypesTest.php b/tests/BasicTypesTest.php
new file mode 100644
index 0000000..2902629
--- /dev/null
+++ b/tests/BasicTypesTest.php
@@ -0,0 +1,78 @@
+<?php
+
+class BasicTypesTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{ 
+                  "string":null,
+                  "number":null,
+                  "integer":null,
+                  "boolean":null,
+                  "object":null,
+                  "array":null,
+                  "null":1
+                }',
+                '{ 
+                  "type":"object",
+                  "properties":{
+                    "string":{"type":"string"},
+                    "number":{"type":"number"},
+                    "integer":{"type":"integer"},
+                    "boolean":{"type":"boolean"},
+                    "object":{"type":"object"},
+                    "array":{"type":"array"},
+                    "null":{"type":"null"}
+                  },
+                  "additionalProperties":false
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{ 
+                  "string":"string test",
+                  "number":1,
+                  "integer":1,
+                  "boolean":true,
+                  "object":{},
+                  "array":[],
+                  "null":null,
+                  "any": "string",
+                  "any1": 2.6,
+                  "any2": 4,
+                  "any3": false,
+                  "any4": {},
+                  "any5": [],
+                  "any6": null
+                }',
+                '{ 
+                  "type":"object",
+                  "properties":{
+                    "string":{"type":"string"},
+                    "number":{"type":"number"},
+                    "integer":{"type":"integer"},
+                    "boolean":{"type":"boolean"},
+                    "object":{"type":"object"},
+                    "array":{"type":"array"},
+                    "null":{"type":"null"},
+                    "any": {"type":"any"},
+                    "any1": {"type":"any"},
+                    "any2": {"type":"any"},
+                    "any3": {"type":"any"},
+                    "any4": {"type":"any"},
+                    "any5": {"type":"any"},
+                    "any6": {"type":"any"}
+                  },
+                  "additionalProperties":false
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/DisallowTest.php b/tests/DisallowTest.php
new file mode 100644
index 0000000..cf8c6f9
--- /dev/null
+++ b/tests/DisallowTest.php
@@ -0,0 +1,72 @@
+<?php
+
+class DisallowTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":" The xpto is weird"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{
+                      "type":"any",
+                      "disallow":{"type":"string","pattern":"xpto"}
+                    }
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":null
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{
+                      "type":"any",
+                      "disallow":{"type":"null"}
+                    }
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":" The xpto is weird"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{
+                      "type":"any",
+                      "disallow":{"type":"string","pattern":"^xpto"}
+                    }
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":1
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{
+                      "type":"any",
+                      "disallow":{"type":"null"}
+                    }
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/EnumTest.php b/tests/EnumTest.php
new file mode 100644
index 0000000..f5eb5c6
--- /dev/null
+++ b/tests/EnumTest.php
@@ -0,0 +1,40 @@
+<?php
+
+class EnumTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":"Morango"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","enum":["Abacate","Manga","Pitanga"]}
+                  },
+                  "additionalProperties":false
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":"Abacate"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","enum":["Abacate","Manga","Pitanga"]}
+                  },
+                  "additionalProperties":false
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/ExtendsTest.php b/tests/ExtendsTest.php
new file mode 100644
index 0000000..58e0c51
--- /dev/null
+++ b/tests/ExtendsTest.php
@@ -0,0 +1,94 @@
+<?php
+
+class ExtendsTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "name":"bruno",
+                  "age":50
+                }',
+                '{
+                    "id": "person",
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string" 
+                        },
+                        "age" : {
+                            "type": "integer",
+                             "maximum":120
+                        } 
+                    },
+                    "extends": {
+                        "id": "oldPerson",
+                        "type": "object",
+                        "properties": {
+                            "age" : {"minimum":70} 
+                        }
+                    }
+                }'
+            ),
+            array(
+                '{
+                  "name":"bruno",
+                  "age":180
+                }',
+                '{
+                    "id": "person",
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string" 
+                        },
+                        "age" : {
+                            "type": "integer",
+                             "maximum":120
+                        } 
+                    },
+                    "extends": {
+                        "id": "oldPerson",
+                        "type": "object",
+                        "properties": {
+                            "age" : {"minimum":70} 
+                        }
+                    }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "name":"bruno",
+                  "age":80
+                }',
+                '{
+                    "id": "person",
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string" 
+                        },
+                        "age" : {
+                            "type": "integer",
+                             "maximum":120
+                        } 
+                    },
+                    "extends": {
+                        "id": "oldPerson",
+                        "type": "object",
+                        "properties": {
+                            "age" : {"minimum":70} 
+                        }
+                    }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/MaxDecimalTest.php b/tests/MaxDecimalTest.php
new file mode 100644
index 0000000..067d497
--- /dev/null
+++ b/tests/MaxDecimalTest.php
@@ -0,0 +1,38 @@
+<?php
+
+class MaxDecimalTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":5.6333
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"number","maxDecimal":3}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":5.633
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"number","maxDecimal":3}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/MinItemsMaxItemsTest.php b/tests/MinItemsMaxItemsTest.php
new file mode 100644
index 0000000..b0800d1
--- /dev/null
+++ b/tests/MinItemsMaxItemsTest.php
@@ -0,0 +1,60 @@
+<?php
+
+class MinItemsMaxItemsTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":[2]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"array","minItems":2,"maxItems":4}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":2,2,5,8,5]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"array","minItems":2,"maxItems":4}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":[2,2]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"array","minItems":2,"maxItems":4}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":[2,2,5,8] 
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"array","minItems":2,"maxItems":4}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/MinLengthMaxLengthTest.php b/tests/MinLengthMaxLengthTest.php
new file mode 100644
index 0000000..6d0f4b9
--- /dev/null
+++ b/tests/MinLengthMaxLengthTest.php
@@ -0,0 +1,61 @@
+<?php
+
+class MinLengthMaxLengthTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":"w" 
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","minLength":2,"maxLength":4}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":"wo7us"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","minLength":2,"maxLength":4}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":"wo"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","minLength":2,"maxLength":4}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":"wo7u"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","minLength":2,"maxLength":4}
+                  }
+                }'
+            ),
+            
+        );
+    }
+}
diff --git a/tests/MinimumMaximumTest.php b/tests/MinimumMaximumTest.php
new file mode 100644
index 0000000..fb60b6b
--- /dev/null
+++ b/tests/MinimumMaximumTest.php
@@ -0,0 +1,60 @@
+<?php
+
+class MinimumMaximumTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":2
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"integer","minimum":4}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":16
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"integer","maximum":8}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":6
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"integer","minimum":4}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "value":6
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"integer","maximum":8}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/NumberAndIntegerTypesTest.php b/tests/NumberAndIntegerTypesTest.php
new file mode 100644
index 0000000..c64da6a
--- /dev/null
+++ b/tests/NumberAndIntegerTypesTest.php
@@ -0,0 +1,49 @@
+<?php
+
+class NumberAndIntegerTypesTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "number": 1.4
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "number":{"type":"integer"}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "number": 1
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "number":{"type":"number"}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "number": 1.4
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "number":{"type":"number"}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/OptionalPropertyTest.php b/tests/OptionalPropertyTest.php
new file mode 100644
index 0000000..690848b
--- /dev/null
+++ b/tests/OptionalPropertyTest.php
@@ -0,0 +1,36 @@
+<?php
+
+class OptionalPropertyTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{}',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "number":{"type":"string","optional":false}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "number": "1.4"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "number":{"type":"string","optional":false}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/PatternTest.php b/tests/PatternTest.php
new file mode 100644
index 0000000..bee14d2
--- /dev/null
+++ b/tests/PatternTest.php
@@ -0,0 +1,52 @@
+<?php
+
+class PatternTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":"Abacates"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","pattern":"^cat"}
+                  },
+                  "additionalProperties":false
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "value":"Abacates"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","pattern":"tes$"}
+                  },
+                  "additionalProperties":false
+                }'
+            ),
+            array(
+                '{
+                  "value":"Abacates"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "value":{"type":"string","pattern":"cat"}
+                  },
+                  "additionalProperties":false
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/PhpTypeCastModeTest.php b/tests/PhpTypeCastModeTest.php
new file mode 100644
index 0000000..d2ca822
--- /dev/null
+++ b/tests/PhpTypeCastModeTest.php
@@ -0,0 +1,61 @@
+<?php
+
+class PhpTypeCastModeTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "a":"c"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "a":{"type":"number"}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "a":"9"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "a":{"type":"number"}
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "a":"9"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "a":{"type":"integer","maximum":8}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "a":"9"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "a":{"type":"integer","maximum":8.0}
+                  }
+                }',
+                JsonSchema::CHECK_MODE_TYPE_CAST
+            )
+        );
+    }
+}
diff --git a/tests/RequireTest.php b/tests/RequireTest.php
new file mode 100644
index 0000000..f95856e
--- /dev/null
+++ b/tests/RequireTest.php
@@ -0,0 +1,41 @@
+<?php
+
+class RequireTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "state":"DF"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "state":{"type":"string","optional":true,"requires":"city"},
+                    "city":{"type":"string","optional":true}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "state":"DF",
+                  "city":"Brasília"
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "state":{"type":"string","optional":true,"requires":"city"},
+                    "city":{"type":"string","optional":true}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/SelfDefinedSchemaTest.php b/tests/SelfDefinedSchemaTest.php
new file mode 100644
index 0000000..e38b871
--- /dev/null
+++ b/tests/SelfDefinedSchemaTest.php
@@ -0,0 +1,56 @@
+<?php
+
+class SelfDefinedSchemaTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                    "$schema": {
+                        "properties": {
+                            "name": {
+                                "type": "string" 
+                            },
+                            "age" : {
+                                "type": "integer",
+                                "maximum": 25,
+                                "optional": true 
+                            } 
+                        } 
+                    },
+                    "name" : "John Doe",
+                    "age" : 30,
+                    "type" : "object"
+                }',
+                ''
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                    "$schema": {
+                        "properties": {
+                            "name": {
+                                "type": "string" 
+                            },
+                            "age" : {
+                                "type": "integer",
+                                "maximum": 125,
+                                "optional": true 
+                            } 
+                        } 
+                    },
+                    "name" : "John Doe",
+                    "age" : 30,
+                    "type" : "object"
+                }',
+                ''
+            )
+        );
+    }
+}
diff --git a/tests/TupleTypingTest.php b/tests/TupleTypingTest.php
new file mode 100644
index 0000000..c0565a6
--- /dev/null
+++ b/tests/TupleTypingTest.php
@@ -0,0 +1,104 @@
+<?php
+
+class TupleTypingTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "tupleTyping":[2,"a"]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "tupleTyping":{
+                      "type":"array",
+                      "items":[
+                        {"type":"string"},
+                        {"type":"number"}
+                      ] 
+                    }
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "tupleTyping":["2",2,3]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "tupleTyping":{
+                      "type":"array",
+                      "items":[
+                        {"type":"string"},
+                        {"type":"number"}
+                      ] ,
+                      "additionalProperties":false
+                    }
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "tupleTyping":["2",2,3]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "tupleTyping":{
+                      "type":"array",
+                      "items":[
+                        {"type":"string"},
+                        {"type":"number"}
+                      ] ,
+                      "additionalProperties":{"type":"string"}
+                    }
+                  }
+                }'
+            ),
+            array(
+                '{
+                  "tupleTyping":["2"]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "tupleTyping":{
+                      "type":"array",
+                      "items":[
+                        {"type":"string"},
+                        {"type":"number"}
+                      ] 
+                    }
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "tupleTyping":["2"]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "tupleTyping":{
+                      "type":"array",
+                      "items":[
+                        {"type":"string"},
+                        {"type":"number","optional":true},
+                        {"type":"number","optional":true}
+                      ] 
+                    }
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/UnionTypesTest.php b/tests/UnionTypesTest.php
new file mode 100644
index 0000000..0e3a516
--- /dev/null
+++ b/tests/UnionTypesTest.php
@@ -0,0 +1,42 @@
+<?php
+
+class UnionTypesTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "stringOrNumber":4.8,
+                  "booleanOrNull":5
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "stringOrNumber":{"type":["string","number"]},
+                    "booleanOrNull":{"type":["boolean","null"]}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "stringOrNumber":4.8,
+                  "booleanOrNull":false
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "stringOrNumber":{"type":["string","number"]},
+                    "booleanOrNull":{"type":["boolean","null"]}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/UnionWithNullValueTest.php b/tests/UnionWithNullValueTest.php
new file mode 100644
index 0000000..b535e50
--- /dev/null
+++ b/tests/UnionWithNullValueTest.php
@@ -0,0 +1,42 @@
+<?php
+
+class UnionWithNullValueTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "stringOrNumber":null,
+                  "booleanOrNull":null
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "stringOrNumber":{"type":["string","number"]},
+                    "booleanOrNull":{"type":["boolean","null"]}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "stringOrNumber":12,
+                  "booleanOrNull":null
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "stringOrNumber":{"type":["string","number"]},
+                    "booleanOrNull":{"type":["boolean","null"]}
+                  }
+                }'
+            )
+        );
+    }
+}
diff --git a/tests/WrongMessagesFailingTestCaseTest.php b/tests/WrongMessagesFailingTestCaseTest.php
new file mode 100644
index 0000000..d8d6364
--- /dev/null
+++ b/tests/WrongMessagesFailingTestCaseTest.php
@@ -0,0 +1,42 @@
+<?php
+
+class WrongMessagesFailingTestCaseTest extends BaseTestCase
+{
+    public function getInvalidTests()
+    {
+        return array(
+            array(
+                '{
+                  "stringOrNumber":4.8,
+                  "booleanOrNull":["A","B"]
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "stringOrNumber":{"type":["string","number"]},
+                    "booleanOrNull":{"type":["boolean","null"]}
+                  }
+                }'
+            )
+        );
+    }
+    
+    public function getValidTests()
+    {
+        return array(
+            array(
+                '{
+                  "stringOrNumber":4.8,
+                  "booleanOrNull":true
+                }',
+                '{
+                  "type":"object",
+                  "properties":{
+                    "stringOrNumber":{"type":["string","number"]},
+                    "booleanOrNull":{"type":["boolean","null"]}
+                  }
+                }'
+            )
+        );
+    }
+}