diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9395936..bce78ac 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,6 +4,10 @@ The project follows the [Open Knowledge International coding standards](https://
 
 All PHP Code should conform to [PHP-FIG](http://www.php-fig.org/psr/) accepted PSRs.
 
+Flow Framework has a nice guide regarding coding standards:
+* [Printable summary of most important coding guidelines on one page **(.pdf)**](http://flowframework.readthedocs.io/en/stable/_downloads/Flow_Coding_Guidelines_on_one_page.pdf)
+* [The full guide **(.html)**](http://flowframework.readthedocs.io/en/stable/TheDefinitiveGuide/PartV/CodingGuideLines/PHP.html)
+
 
 ## Getting Started
 
diff --git a/README.md b/README.md
index c237089..13c36aa 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,8 @@ $ composer require frictionlessdata/datapackage
 ```php
 use frictionlessdata\datapackage;
 
-$datapackage = new Datapackage("tests/fixtures/multi_data_datapackage.json");
+// iterate over the data
+$datapackage = new datapackage\Datapackage("tests/fixtures/multi_data_datapackage.json");
 foreach ($datapackage as $resource) {
     print("-- ".$resource->name()." --");
     $i = 0;
@@ -34,6 +35,14 @@ foreach ($datapackage as $resource) {
         }
     }
 }
+
+// validate the descriptor
+$validationErrors = datapackage\Datapackage::validate("tests/fixtures/simple_invalid_datapackage.json");
+if (count($validationErrors) == 0) {
+    print("descriptor is valid");
+} else {
+    print(datapackage\DatapackageValidationError::getErrorMessages($validationErrors));
+}
 ```
 
 
diff --git a/composer.json b/composer.json
index 9deae4b..c5a5a2c 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,9 @@
     "description": "A utility library for working with Data Packages",
     "license": "MIT",
     "require": {
-        "php": ">=5.4"
+        "php": ">=5.4",
+        "justinrainbow/json-schema": "^5.2",
+        "frictionlessdata/tableschema": "^0.1.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.35",
@@ -15,6 +17,6 @@
         }
     },
     "scripts": {
-        "test": "phpunit --debug tests/ --coverage-clover coverage-clover.xml"
+        "test": "phpunit --debug --coverage-clover coverage-clover.xml --bootstrap tests/autoload.php tests/"
     }
 }
diff --git a/src/DataStream.php b/src/DataStream.php
index 0e59ac0..419756f 100644
--- a/src/DataStream.php
+++ b/src/DataStream.php
@@ -1,34 +1,30 @@
-<?php namespace frictionlessdata\datapackage;
-
+<?php
+namespace frictionlessdata\datapackage;
 
 class DataStream implements \Iterator
 {
-    protected $_currentLineNumber = 0;
-    protected $_fopenResource;
-    protected $_dataSource;
-
     public function __construct($dataSource)
     {
         try {
-            $this->_fopenResource = fopen($dataSource, "r");
+            $this->fopenResource = fopen($dataSource, "r");
         } catch (\Exception $e) {
-            throw new DataStreamOpenException("Failed to open source ".json_encode($dataSource));
+            throw new Exceptions\DataStreamOpenException("Failed to open source ".json_encode($dataSource).": ".json_encode($e->getMessage()));
         }
     }
 
     public function __destruct()
     {
-        fclose($this->_fopenResource);
+        fclose($this->fopenResource);
     }
 
     public function rewind() {
-        if ($this->_currentLineNumber != 0) {
+        if ($this->currentLineNumber != 0) {
             throw new \Exception("DataStream does not support rewind, sorry");
         }
     }
 
     public function current() {
-        $line = fgets($this->_fopenResource);
+        $line = fgets($this->fopenResource);
         if ($line === false) {
             return "";
         } else {
@@ -37,17 +33,18 @@ public function current() {
     }
 
     public function key() {
-        return $this->_currentLineNumber;
+        return $this->currentLineNumber;
     }
 
     public function next() {
-        $this->_currentLineNumber++;
+        $this->currentLineNumber++;
     }
 
     public function valid() {
-        return (!feof($this->_fopenResource));
+        return (!feof($this->fopenResource));
     }
-}
 
-
-class DataStreamOpenException extends \Exception {};
+    protected $currentLineNumber = 0;
+    protected $fopenResource;
+    protected $dataSource;
+}
diff --git a/src/Datapackage.php b/src/Datapackage.php
index d8b714a..abf64bb 100644
--- a/src/Datapackage.php
+++ b/src/Datapackage.php
@@ -1,5 +1,5 @@
-<?php namespace frictionlessdata\datapackage;
-
+<?php
+namespace frictionlessdata\datapackage;
 
 /**
  * Datapackage representation, supports loading from the following sources:
@@ -10,80 +10,121 @@
  */
 class Datapackage implements \Iterator
 {
-    protected $_descriptor;
-    protected $_currentResourcePosition = 0;
-    protected $_basePath;
-
     public function __construct($source, $basePath=null)
     {
         if (is_object($source)) {
-            $this->_descriptor = $source;
-            $this->_basePath = $basePath;
+            $this->descriptor = $source;
+            $this->basePath = $basePath;
         } elseif (is_string($source)) {
-            if (Utils::is_json_string($source)) {
+            if (Utils::isJsonString($source)) {
                 try {
-                    $this->_descriptor = json_decode($source);
+                    $this->descriptor = json_decode($source);
                 } catch (\Exception $e) {
-                    throw new DatapackageInvalidSourceException("Failed to load source: ".json_encode($source).": ".$e->getMessage());
+                    throw new Exceptions\DatapackageInvalidSourceException(
+                        "Failed to load source: ".json_encode($source).": ".$e->getMessage()
+                    );
                 }
-                $this->_basePath = $basePath;
-            } elseif ($this->_isHttpSource($source)) {
+                $this->basePath = $basePath;
+            } elseif ($this->isHttpSource($source)) {
                 try {
-                    $this->_descriptor = json_decode(file_get_contents($this->_normalizeHttpSource($source)));
+                    $this->descriptor = json_decode(file_get_contents($this->normalizeHttpSource($source)));
                 } catch (\Exception $e) {
-                    throw new DatapackageInvalidSourceException("Failed to load source: ".json_encode($source).": ".$e->getMessage());
+                    throw new Exceptions\DatapackageInvalidSourceException(
+                        "Failed to load source: ".json_encode($source).": ".$e->getMessage()
+                    );
                 }
                 // http sources don't allow relative paths, hence basePath should remain null
-                $this->_basePath = null;
+                $this->basePath = null;
             } else {
                 if (empty($basePath)) {
-                    $this->_basePath = dirname($source);
+                    $this->basePath = dirname($source);
                 } else {
-                    $this->_basePath = $basePath;
-                    $absPath = $this->_basePath.DIRECTORY_SEPARATOR.$source;
+                    $this->basePath = $basePath;
+                    $absPath = $this->basePath.DIRECTORY_SEPARATOR.$source;
                     if (file_exists($absPath)) {
                         $source = $absPath;
                     }
                 }
                 try {
-                    $this->_descriptor = json_decode(file_get_contents($source));
+                    $this->descriptor = json_decode(file_get_contents($source));
                 } catch (\Exception $e) {
-                    throw new DatapackageInvalidSourceException("Failed to load source: ".json_encode($source).": ".$e->getMessage());
+                    throw new Exceptions\DatapackageInvalidSourceException(
+                        "Failed to load source: ".json_encode($source).": ".$e->getMessage()
+                    );
                 }
 
             }
         } else {
-            throw new DatapackageInvalidSourceException("Invalid source: ".json_encode($source));
+            throw new Exceptions\DatapackageInvalidSourceException(
+                "Invalid source: ".json_encode($source)
+            );
         }
     }
 
-    protected function _normalizeHttpSource($source)
+    public static function validate($source, $basePath=null)
     {
-        return $source;
+        try {
+            $datapackage = new self($source, $basePath);
+            return DatapackageValidator::validate($datapackage->descriptor());
+        } catch (\Exception $e) {
+            return [new DatapackageValidationError(DatapackageValidationError::LOAD_FAILED, $e->getMessage())];
+        }
+
     }
 
-    protected function _isHttpSource($source)
+    /**
+     * get the descriptor as a native PHP object
+     *
+     * @return object
+     */
+    public function descriptor()
     {
-        return Utils::is_http_source($source);
+        return $this->descriptor;
     }
 
-    protected function _initResource($resourceDescriptor)
+    // standard iterator functions - to iterate over the resources
+    public function rewind() {$this->currentResourcePosition = 0;}
+    public function current() { return $this->initResource($this->descriptor()->resources[$this->currentResourcePosition]); }
+    public function key() { return $this->currentResourcePosition; }
+    public function next() { $this->currentResourcePosition++; }
+    public function valid() { return isset($this->descriptor()->resources[$this->currentResourcePosition]); }
+
+    protected $descriptor;
+    protected $currentResourcePosition = 0;
+    protected $basePath;
+
+    /**
+     * allows extending classes to add custom sources
+     * used by unit tests to add a mock http source
+     *
+     * @param string $source
+     * @return string
+     */
+    protected function normalizeHttpSource($source)
     {
-        return new Resource($resourceDescriptor, $this->_basePath);
+        return $source;
     }
 
-    public function descriptor()
+    /**
+     * allows extending classes to add custom sources
+     * used by unit tests to add a mock http source
+     *
+     * @param string $source
+     * @return bool
+     */
+    protected function isHttpSource($source)
     {
-        return $this->_descriptor;
+        return Utils::isHttpSource($source);
     }
 
-    // standard iterator functions - to iterate over the resources
-    public function rewind() { $this->_currentResourcePosition = 0; }
-    public function current() { return $this->_initResource($this->descriptor()->resources[$this->_currentResourcePosition]); }
-    public function key() { return $this->_currentResourcePosition; }
-    public function next() { $this->_currentResourcePosition++; }
-    public function valid() { return isset($this->descriptor()->resources[$this->_currentResourcePosition]); }
+    /**
+     * called by the resources iterator for each iteration
+     *
+     * @param object $resourceDescriptor
+     * @return \frictionlessdata\datapackage\Resource
+     */
+    protected function initResource($resourceDescriptor)
+    {
+        return new Resource($resourceDescriptor, $this->basePath);
+    }
 }
-
-
-class DatapackageInvalidSourceException extends \Exception {};
diff --git a/src/DatapackageValidationError.php b/src/DatapackageValidationError.php
new file mode 100644
index 0000000..cb090d3
--- /dev/null
+++ b/src/DatapackageValidationError.php
@@ -0,0 +1,8 @@
+<?php namespace frictionlessdata\datapackage;
+
+// TODO: move the SchemaValidation logic to it's own independent package
+use frictionlessdata\tableschema;
+
+class DatapackageValidationError extends tableschema\SchemaValidationError
+{
+}
diff --git a/src/DatapackageValidator.php b/src/DatapackageValidator.php
new file mode 100644
index 0000000..1b1983e
--- /dev/null
+++ b/src/DatapackageValidator.php
@@ -0,0 +1,32 @@
+<?php namespace frictionlessdata\datapackage;
+
+// TODO: move the SchemaValidation logic to it's own independent package
+use frictionlessdata\tableschema;
+
+class DatapackageValidator extends tableschema\SchemaValidator
+{
+    public static function validate($descriptor)
+    {
+        $validator = new self($descriptor);
+        return $validator->get_validation_errors();
+    }
+
+    protected function _validateSchema()
+    {
+        // Validate
+        $validator = new \JsonSchema\Validator();
+        $validator->validate(
+            $this->descriptor, (object)[
+                '$ref' => 'file://' . realpath(dirname(__FILE__)).'/schemas/data-package.json'
+            ]
+        );
+        if (!$validator->isValid()) {
+            foreach ($validator->getErrors() as $error) {
+                $this->_addError(
+                    DatapackageValidationError::SCHEMA_VIOLATION,
+                    sprintf("[%s] %s", $error['property'], $error['message'])
+                );
+            }
+        }
+    }
+}
diff --git a/src/Exceptions/DataStreamOpenException.php b/src/Exceptions/DataStreamOpenException.php
new file mode 100644
index 0000000..b6894cc
--- /dev/null
+++ b/src/Exceptions/DataStreamOpenException.php
@@ -0,0 +1,6 @@
+<?php
+namespace frictionlessdata\datapackage\Exceptions;
+
+class DataStreamOpenException extends \Exception {
+
+}
diff --git a/src/Exceptions/DatapackageInvalidSourceException.php b/src/Exceptions/DatapackageInvalidSourceException.php
new file mode 100644
index 0000000..d4b2187
--- /dev/null
+++ b/src/Exceptions/DatapackageInvalidSourceException.php
@@ -0,0 +1,6 @@
+<?php
+namespace frictionlessdata\datapackage\Exceptions;
+
+class DatapackageInvalidSourceException extends \Exception {
+
+}
diff --git a/src/Resource.php b/src/Resource.php
index f43d455..b734788 100644
--- a/src/Resource.php
+++ b/src/Resource.php
@@ -1,54 +1,68 @@
-<?php namespace frictionlessdata\datapackage;
-
+<?php
+namespace frictionlessdata\datapackage;
 
 class Resource implements \Iterator
 {
-    protected $_descriptor;
-    protected $_basePath;
-    protected $_currentDataPosition = 0;
-
     public function __construct($descriptor, $basePath)
     {
-        $this->_basePath = $basePath;
-        $this->_descriptor = $descriptor;
+        $this->basePath = $basePath;
+        $this->descriptor = $descriptor;
     }
 
-    protected function _isHttpSource($dataSource)
+    public function descriptor()
     {
-        return Utils::is_http_source($dataSource);
+        return $this->descriptor;
     }
 
-    protected function _normalizeDataSource($dataSource)
+    public function name()
     {
-        if (!empty($this->_basePath) && !Utils::is_http_source($dataSource)) {
-            // TODO: support JSON pointers
-            $absPath = $this->_basePath.DIRECTORY_SEPARATOR.$dataSource;
-            if (file_exists($absPath)) {
-                $dataSource = $absPath;
-            }
-        }
-        return $dataSource;
+        return $this->descriptor()->name;
     }
 
-    protected function _getDataStream($dataSource)
+    // standard iterator functions - to iterate over the data sources
+    public function rewind() { $this->_currentDataPosition = 0; }
+    public function current() { return $this->getDataStream($this->descriptor()->data[$this->currentDataPosition]); }
+    public function key() { return $this->currentDataPosition; }
+    public function next() { $this->currentDataPosition++; }
+    public function valid() { return isset($this->descriptor()->data[$this->currentDataPosition]); }
+
+    protected $descriptor;
+    protected $basePath;
+    protected $currentDataPosition = 0;
+
+    /**
+     * allows extending classes to add custom sources
+     * used by unit tests to add a mock http source
+     *
+     * @param string $dataSource
+     * @return bool
+     */
+    protected function isHttpSource($dataSource)
     {
-        return new DataStream($this->_normalizeDataSource($dataSource));
+        return Utils::isHttpSource($dataSource);
     }
 
-    public function descriptor()
+    /**
+     * allows extending classes to add custom sources
+     * used by unit tests to add a mock http source
+     *
+     * @param string $dataSource
+     * @return string
+     */
+    protected function normalizeDataSource($dataSource)
     {
-        return $this->_descriptor;
+        if (!empty($this->basePath) && !$this->isHttpSource($dataSource)) {
+            // TODO: support JSON pointers
+            $absPath = $this->basePath.DIRECTORY_SEPARATOR.$dataSource;
+            if (file_exists($absPath)) {
+                $dataSource = $absPath;
+            }
+        }
+        return $dataSource;
     }
 
-    public function name()
+    protected function getDataStream($dataSource)
     {
-        return $this->descriptor()->name;
+        return new DataStream($this->normalizeDataSource($dataSource));
     }
-
-    // standard iterator functions - to iterate over the data sources
-    public function rewind() { $this->_currentDataPosition = 0; }
-    public function current() { return $this->_getDataStream($this->descriptor()->data[$this->_currentDataPosition]); }
-    public function key() { return $this->_currentDataPosition; }
-    public function next() { $this->_currentDataPosition++; }
-    public function valid() { return isset($this->descriptor()->data[$this->_currentDataPosition]); }
 }
diff --git a/src/Utils.php b/src/Utils.php
index bc65bf2..d78fb04 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -1,10 +1,10 @@
-<?php namespace frictionlessdata\datapackage;
-
+<?php
+namespace frictionlessdata\datapackage;
 
+// TODO: refactor to an independenct package (used by both tableschema and datapackage)
 class Utils
 {
-
-    public static function is_json_string($json)
+    public static function isJsonString($json)
     {
         return (
             is_string($json)
@@ -12,7 +12,7 @@ public static function is_json_string($json)
         );
     }
 
-    public static function is_http_source($source)
+    public static function isHttpSource($source)
     {
         return (
             is_string($source)
@@ -22,5 +22,4 @@ public static function is_http_source($source)
             )
         );
     }
-
 }
diff --git a/src/schemas/data-package.json b/src/schemas/data-package.json
new file mode 100644
index 0000000..056a470
--- /dev/null
+++ b/src/schemas/data-package.json
@@ -0,0 +1,594 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Data Package",
+  "description": "Data Package is a simple specification for data access and delivery.",
+  "type": "object",
+  "required": [
+    "resources"
+  ],
+  "properties": {
+    "profile": {
+      "propertyOrder": 10,
+      "title": "Profile",
+      "description": "The profile of this descriptor.",
+      "context": "Every Package and Resource descriptor has a profile. The default profile, if none is declared, is `default`. The namespace for the profile is the type of descriptor, so, `default` for a Package descriptor is not the same as `default` for a Resource descriptor.",
+      "type": "string",
+      "default": "default",
+      "examples": [
+        "{\n  \"profile\": \"tabular-data-package\"\n}\n",
+        "{\n  \"profile\": \"http://example.com/my-profiles-json-schema.json\"\n}\n"
+      ]
+    },
+    "name": {
+      "propertyOrder": 20,
+      "title": "Name",
+      "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+      "type": "string",
+      "pattern": "^([-a-z0-9._/])+$",
+      "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+      "examples": [
+        "{\n  \"name\": \"my-nice-name\"\n}\n"
+      ]
+    },
+    "id": {
+      "propertyOrder": 30,
+      "title": "ID",
+      "description": "A property reserved for globally unique identifiers. Examples of identifiers that are unique include UUIDs and DOIs.",
+      "context": "A common usage pattern for Data Packages is as a packaging format within the bounds of a system or platform. In these cases, a unique identifier for a package is desired for common data handling workflows, such as updating an existing package. While at the level of the specification, global uniqueness cannot be validated, consumers using the `id` property `MUST` ensure identifiers are globally unique.",
+      "type": "string",
+      "examples": [
+        "{\n  \"id\": \"b03ec84-77fd-4270-813b-0c698943f7ce\"\n}\n",
+        "{\n  \"id\": \"http://dx.doi.org/10.1594/PANGAEA.726855\"\n}\n"
+      ]
+    },
+    "title": {
+      "propertyOrder": 40,
+      "title": "Title",
+      "description": "A human-readable title.",
+      "type": "string",
+      "examples": [
+        "{\n  \"title\": \"My Package Title\"\n}\n"
+      ]
+    },
+    "description": {
+      "propertyOrder": 50,
+      "format": "textarea",
+      "title": "Description",
+      "description": "A text description. Markdown is encouraged.",
+      "type": "string",
+      "examples": [
+        "{\n  \"description\": \"# My Package description\\nAll about my package.\"\n}\n"
+      ]
+    },
+    "homepage": {
+      "propertyOrder": 60,
+      "title": "Home Page",
+      "description": "The home on the web that is related to this data package.",
+      "type": "object",
+      "properties": {
+        "name": {
+          "title": "Name",
+          "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+          "type": "string",
+          "pattern": "^([-a-z0-9._/])+$",
+          "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+          "examples": [
+            "{\n  \"name\": \"my-nice-name\"\n}\n"
+          ]
+        },
+        "uri": {
+          "title": "URI",
+          "description": "A URI (with some restrictions), being a fully qualified HTTP address, a relative POSIX path, or a JSON Pointer.",
+          "type": "string",
+          "format": "uri",
+          "examples": [
+            "{\n  \"uri\": \"file.csv\"\n}\n",
+            "{\n  \"uri\": \"#/data/my-data\"\n}\n",
+            "{\n  \"uri\": \"http://example.com/file.csv\"\n}\n"
+          ],
+          "context": "Implementations need to negotiate the type of URI provided, and dereference the data accordingly. There are restrictions imposed on URIs that are POSIX paths: see [the notes on descriptors](#descriptor) for more information."
+        },
+        "title": {
+          "title": "Title",
+          "description": "A human-readable title.",
+          "type": "string",
+          "examples": [
+            "{\n  \"title\": \"My Package Title\"\n}\n"
+          ]
+        }
+      },
+      "examples": [
+        "{\n  \"homepage\": {\n    \"name\": \"My Web Page\",\n    \"uri\": \"http://example.com/\"\n  }\n}\n"
+      ]
+    },
+    "created": {
+      "propertyOrder": 70,
+      "title": "Created",
+      "description": "The datetime on which this descriptor was created.",
+      "context": "The datetime must conform to the string formats for datetime as described in [RFC3339](https://tools.ietf.org/html/rfc3339#section-5.6)",
+      "type": "string",
+      "format": "date-time",
+      "examples": [
+        "{\n  \"created\": \"1985-04-12T23:20:50.52Z\"\n}\n"
+      ]
+    },
+    "contributors": {
+      "propertyOrder": 80,
+      "title": "Contributors",
+      "description": "The contributors to this descriptor.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "title": "Contributor",
+        "description": "A contributor to this descriptor.",
+        "properties": {
+          "name": {
+            "title": "Name",
+            "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+            "type": "string",
+            "pattern": "^([-a-z0-9._/])+$",
+            "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+            "examples": [
+              "{\n  \"name\": \"my-nice-name\"\n}\n"
+            ]
+          },
+          "uri": {
+            "title": "URI",
+            "description": "A URI (with some restrictions), being a fully qualified HTTP address, a relative POSIX path, or a JSON Pointer.",
+            "type": "string",
+            "format": "uri",
+            "examples": [
+              "{\n  \"uri\": \"file.csv\"\n}\n",
+              "{\n  \"uri\": \"#/data/my-data\"\n}\n",
+              "{\n  \"uri\": \"http://example.com/file.csv\"\n}\n"
+            ],
+            "context": "Implementations need to negotiate the type of URI provided, and dereference the data accordingly. There are restrictions imposed on URIs that are POSIX paths: see [the notes on descriptors](#descriptor) for more information."
+          },
+          "email": {
+            "title": "Email",
+            "description": "An email address.",
+            "type": "string",
+            "format": "email",
+            "examples": [
+              "{\n  \"email\": \"example@example.com\"\n}\n"
+            ]
+          },
+          "role": {
+            "type": "string",
+            "enum": [
+              "author",
+              "maintainer"
+            ]
+          }
+        },
+        "required": [
+          "name"
+        ],
+        "context": "Use of this property does not imply that the person was the original creator of, or a contributor to, the data in the descriptor, but refers to the composition of the descriptor itself."
+      },
+      "examples": [
+        "{\n  \"contributors\": [\n    {\n      \"name\": \"Joe Bloggs\"\n    }\n  ]\n}\n",
+        "{\n  \"contributors\": [\n    {\n      \"name\": \"Joe Bloggs\",\n      \"email\": \"joe@example.com\",\n      \"role\": \"author\"\n    }\n  ]\n}\n"
+      ]
+    },
+    "keywords": {
+      "propertyOrder": 90,
+      "title": "Keywords",
+      "description": "A list of keywords that describe this package.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "type": "string"
+      },
+      "examples": [
+        "{\n  \"keywords\": [\n    \"data\",\n    \"fiscal\",\n    \"transparency\"\n  ]\n}\n"
+      ]
+    },
+    "licenses": {
+      "propertyOrder": 100,
+      "title": "Licenses",
+      "description": "The license(s) under which this package is published.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "title": "License",
+        "description": "A license for this descriptor.",
+        "type": "object",
+        "required": [
+          "uri"
+        ],
+        "properties": {
+          "name": {
+            "title": "Name",
+            "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+            "type": "string",
+            "pattern": "^([-a-z0-9._/])+$",
+            "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+            "examples": [
+              "{\n  \"name\": \"my-nice-name\"\n}\n"
+            ]
+          },
+          "uri": {
+            "title": "URI",
+            "description": "A URI (with some restrictions), being a fully qualified HTTP address, a relative POSIX path, or a JSON Pointer.",
+            "type": "string",
+            "format": "uri",
+            "examples": [
+              "{\n  \"uri\": \"file.csv\"\n}\n",
+              "{\n  \"uri\": \"#/data/my-data\"\n}\n",
+              "{\n  \"uri\": \"http://example.com/file.csv\"\n}\n"
+            ],
+            "context": "Implementations need to negotiate the type of URI provided, and dereference the data accordingly. There are restrictions imposed on URIs that are POSIX paths: see [the notes on descriptors](#descriptor) for more information."
+          },
+          "title": {
+            "title": "Title",
+            "description": "A human-readable title.",
+            "type": "string",
+            "examples": [
+              "{\n  \"title\": \"My Package Title\"\n}\n"
+            ]
+          }
+        },
+        "context": "Use of this property does not imply that the person was the original creator of, or a contributor to, the data in the descriptor, but refers to the composition of the descriptor itself."
+      },
+      "context": "This property is not legally binding and does not guarantee that the package is licensed under the terms defined herein.",
+      "examples": [
+        "{\n  \"licenses\": [\n    {\n      \"name\": \"ODC-PDDL-1.0\",\n      \"uri\": \"http://opendatacommons.org/licenses/pddl/\"\n    }\n  ]\n}\n"
+      ]
+    },
+    "resources": {
+      "propertyOrder": 110,
+      "title": "Data Resources",
+      "description": "An `array` of Data Resource objects, each compliant with the [Data Resource](/data-resource/) specification.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "title": "Data Resource",
+        "description": "Data Resource.",
+        "type": "object",
+        "required": [
+          "name",
+          "data"
+        ],
+        "properties": {
+          "profile": {
+            "propertyOrder": 10,
+            "title": "Profile",
+            "description": "The profile of this descriptor.",
+            "context": "Every Package and Resource descriptor has a profile. The default profile, if none is declared, is `default`. The namespace for the profile is the type of descriptor, so, `default` for a Package descriptor is not the same as `default` for a Resource descriptor.",
+            "type": "string",
+            "default": "default",
+            "examples": [
+              "{\n  \"profile\": \"tabular-data-package\"\n}\n",
+              "{\n  \"profile\": \"http://example.com/my-profiles-json-schema.json\"\n}\n"
+            ]
+          },
+          "name": {
+            "propertyOrder": 20,
+            "title": "Name",
+            "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+            "type": "string",
+            "pattern": "^([-a-z0-9._/])+$",
+            "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+            "examples": [
+              "{\n  \"name\": \"my-nice-name\"\n}\n"
+            ]
+          },
+          "data": {
+            "propertyOrder": 30,
+            "title": "Data",
+            "description": "A reference to the data for this resource. `data` `MUST` be an array of valid URIs.",
+            "type": "array",
+            "minItems": 1,
+            "items": {
+              "examples": [
+                "[ \"file.csv\" ]\n",
+                "[ \"#/data/my-data\" ]\n",
+                "[ \"http://example.com/file.csv\" ]\n"
+              ],
+              "title": "URI",
+              "description": "A URI (with some restrictions), being a fully qualified HTTP address, a relative POSIX path, or a JSON Pointer.",
+              "type": "string",
+              "format": "uri",
+              "context": "Implementations need to negotiate the type of URI provided, and dereference the data accordingly. There are restrictions imposed on URIs that are POSIX paths: see [the notes on descriptors](#descriptor) for more information."
+            },
+            "context": "The dereferenced value of each referenced data source in the `data` `array` `MUST` be commensurate with a native, dereferenced representation of the data the resource describes. For example, in a *Tabular* Data Resource, this means that the dereferenced value of `data` `MUST` be an array.",
+            "examples": [
+              "{\n  \"data\": [\n    \"file.csv\",\n    \"file2.csv\"\n  ]\n}\n",
+              "{\n  \"data\": [\n    \"http://example.com/file.csv\",\n    \"http://example.com/file2.csv\"\n  ]\n}\n",
+              "{\n  \"data\": [\n    \"#/data/my-data\",\n    \"#/data/my-data2\"\n  ]\n}\n"
+            ]
+          },
+          "schema": {
+            "propertyOrder": 40,
+            "title": "Schema",
+            "description": "A schema for this resource.",
+            "type": "object"
+          },
+          "title": {
+            "propertyOrder": 50,
+            "title": "Title",
+            "description": "A human-readable title.",
+            "type": "string",
+            "examples": [
+              "{\n  \"title\": \"My Package Title\"\n}\n"
+            ]
+          },
+          "description": {
+            "propertyOrder": 60,
+            "format": "textarea",
+            "title": "Description",
+            "description": "A text description. Markdown is encouraged.",
+            "type": "string",
+            "examples": [
+              "{\n  \"description\": \"# My Package description\\nAll about my package.\"\n}\n"
+            ]
+          },
+          "homepage": {
+            "propertyOrder": 70,
+            "title": "Home Page",
+            "description": "The home on the web that is related to this data package.",
+            "type": "object",
+            "properties": {
+              "name": {
+                "title": "Name",
+                "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+                "type": "string",
+                "pattern": "^([-a-z0-9._/])+$",
+                "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+                "examples": [
+                  "{\n  \"name\": \"my-nice-name\"\n}\n"
+                ]
+              },
+              "uri": {
+                "title": "URI",
+                "description": "A URI (with some restrictions), being a fully qualified HTTP address, a relative POSIX path, or a JSON Pointer.",
+                "type": "string",
+                "format": "uri",
+                "examples": [
+                  "{\n  \"uri\": \"file.csv\"\n}\n",
+                  "{\n  \"uri\": \"#/data/my-data\"\n}\n",
+                  "{\n  \"uri\": \"http://example.com/file.csv\"\n}\n"
+                ],
+                "context": "Implementations need to negotiate the type of URI provided, and dereference the data accordingly. There are restrictions imposed on URIs that are POSIX paths: see [the notes on descriptors](#descriptor) for more information."
+              },
+              "title": {
+                "title": "Title",
+                "description": "A human-readable title.",
+                "type": "string",
+                "examples": [
+                  "{\n  \"title\": \"My Package Title\"\n}\n"
+                ]
+              }
+            },
+            "examples": [
+              "{\n  \"homepage\": {\n    \"name\": \"My Web Page\",\n    \"uri\": \"http://example.com/\"\n  }\n}\n"
+            ]
+          },
+          "sources": {
+            "propertyOrder": 140,
+            "options": {
+              "hidden": true
+            },
+            "title": "Sources",
+            "description": "The raw sources for this resource.",
+            "type": "array",
+            "minItems": 1,
+            "items": {
+              "title": "Source",
+              "description": "A source file.",
+              "type": "object",
+              "required": [
+                "uri"
+              ],
+              "properties": {
+                "name": {
+                  "title": "Name",
+                  "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+                  "type": "string",
+                  "pattern": "^([-a-z0-9._/])+$",
+                  "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+                  "examples": [
+                    "{\n  \"name\": \"my-nice-name\"\n}\n"
+                  ]
+                },
+                "uri": {
+                  "title": "URI",
+                  "description": "A URI (with some restrictions), being a fully qualified HTTP address, a relative POSIX path, or a JSON Pointer.",
+                  "type": "string",
+                  "format": "uri",
+                  "examples": [
+                    "{\n  \"uri\": \"file.csv\"\n}\n",
+                    "{\n  \"uri\": \"#/data/my-data\"\n}\n",
+                    "{\n  \"uri\": \"http://example.com/file.csv\"\n}\n"
+                  ],
+                  "context": "Implementations need to negotiate the type of URI provided, and dereference the data accordingly. There are restrictions imposed on URIs that are POSIX paths: see [the notes on descriptors](#descriptor) for more information."
+                },
+                "email": {
+                  "title": "Email",
+                  "description": "An email address.",
+                  "type": "string",
+                  "format": "email",
+                  "examples": [
+                    "{\n  \"email\": \"example@example.com\"\n}\n"
+                  ]
+                }
+              }
+            },
+            "examples": [
+              "{\n  \"sources\": [\n    {\n      \"name\": \"World Bank and OECD\",\n      \"uri\": \"http://data.worldbank.org/indicator/NY.GDP.MKTP.CD\"\n    }\n  ]\n}\n"
+            ]
+          },
+          "licenses": {
+            "description": "The license(s) under which the resource is published.",
+            "propertyOrder": 150,
+            "options": {
+              "hidden": true
+            },
+            "title": "Licenses",
+            "type": "array",
+            "minItems": 1,
+            "items": {
+              "title": "License",
+              "description": "A license for this descriptor.",
+              "type": "object",
+              "required": [
+                "uri"
+              ],
+              "properties": {
+                "name": {
+                  "title": "Name",
+                  "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+                  "type": "string",
+                  "pattern": "^([-a-z0-9._/])+$",
+                  "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+                  "examples": [
+                    "{\n  \"name\": \"my-nice-name\"\n}\n"
+                  ]
+                },
+                "uri": {
+                  "title": "URI",
+                  "description": "A URI (with some restrictions), being a fully qualified HTTP address, a relative POSIX path, or a JSON Pointer.",
+                  "type": "string",
+                  "format": "uri",
+                  "examples": [
+                    "{\n  \"uri\": \"file.csv\"\n}\n",
+                    "{\n  \"uri\": \"#/data/my-data\"\n}\n",
+                    "{\n  \"uri\": \"http://example.com/file.csv\"\n}\n"
+                  ],
+                  "context": "Implementations need to negotiate the type of URI provided, and dereference the data accordingly. There are restrictions imposed on URIs that are POSIX paths: see [the notes on descriptors](#descriptor) for more information."
+                },
+                "title": {
+                  "title": "Title",
+                  "description": "A human-readable title.",
+                  "type": "string",
+                  "examples": [
+                    "{\n  \"title\": \"My Package Title\"\n}\n"
+                  ]
+                }
+              },
+              "context": "Use of this property does not imply that the person was the original creator of, or a contributor to, the data in the descriptor, but refers to the composition of the descriptor itself."
+            },
+            "context": "This property is not legally binding and does not guarantee that the package is licensed under the terms defined herein.",
+            "examples": [
+              "{\n  \"licenses\": [\n    {\n      \"name\": \"ODC-PDDL-1.0\",\n      \"uri\": \"http://opendatacommons.org/licenses/pddl/\"\n    }\n  ]\n}\n"
+            ]
+          },
+          "format": {
+            "propertyOrder": 80,
+            "title": "Format",
+            "description": "The file format of this resource.",
+            "context": "`csv`, `xls`, `json` are examples of common formats.",
+            "type": "string",
+            "examples": [
+              "{\n  \"format\": \"xls\"\n}\n"
+            ]
+          },
+          "mediatype": {
+            "propertyOrder": 90,
+            "title": "Media Type",
+            "description": "The media type of this resource. Can be any valid media type listed with [IANA](https://www.iana.org/assignments/media-types/media-types.xhtml).",
+            "type": "string",
+            "pattern": "^(.+)/(.+)$",
+            "examples": [
+              "{\n  \"mediatype\": \"text/csv\"\n}\n"
+            ]
+          },
+          "encoding": {
+            "propertyOrder": 100,
+            "title": "Encoding",
+            "description": "The file encoding of this resource.",
+            "type": "string",
+            "default": "utf-8",
+            "examples": [
+              "{\n  \"encoding\": \"utf-8\"\n}\n"
+            ]
+          },
+          "bytes": {
+            "propertyOrder": 110,
+            "options": {
+              "hidden": true
+            },
+            "title": "Bytes",
+            "description": "The size of this resource in bytes.",
+            "type": "integer",
+            "examples": [
+              "{\n  \"bytes\": 2082\n}\n"
+            ]
+          },
+          "hash": {
+            "propertyOrder": 120,
+            "options": {
+              "hidden": true
+            },
+            "title": "Hash",
+            "type": "string",
+            "description": "The MD5 hash of this resource. Indicate other hashing algorithms with the {algorithm}:{hash} format.",
+            "pattern": "^([^:]+:[a-fA-F0-9]+|[a-fA-F0-9]{32}|)$",
+            "examples": [
+              "{\n  \"hash\": \"d25c9c77f588f5dc32059d2da1136c02\"\n}\n",
+              "{\n  \"hash\": \"SHA256:5262f12512590031bbcc9a430452bfd75c2791ad6771320bb4b5728bfb78c4d0\"\n}\n"
+            ]
+          }
+        }
+      },
+      "examples": [
+        "{\n  \"resources\": [\n    {\n      \"name\": \"my-data\",\n      \"data\": [\n        \"data.csv\"\n      ],\n      \"mediatype\": \"text/csv\"\n    }\n  ]\n}\n"
+      ]
+    },
+    "sources": {
+      "propertyOrder": 200,
+      "options": {
+        "hidden": true
+      },
+      "title": "Sources",
+      "description": "The raw sources for this resource.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "title": "Source",
+        "description": "A source file.",
+        "type": "object",
+        "required": [
+          "uri"
+        ],
+        "properties": {
+          "name": {
+            "title": "Name",
+            "description": "An identifier string. Lower case characters with `.`, `_`, `-` and `/` are allowed.",
+            "type": "string",
+            "pattern": "^([-a-z0-9._/])+$",
+            "context": "This is ideally a url-usable and human-readable name. Name `SHOULD` be invariant, meaning it `SHOULD NOT` change when its parent descriptor is updated.",
+            "examples": [
+              "{\n  \"name\": \"my-nice-name\"\n}\n"
+            ]
+          },
+          "uri": {
+            "title": "URI",
+            "description": "A URI (with some restrictions), being a fully qualified HTTP address, a relative POSIX path, or a JSON Pointer.",
+            "type": "string",
+            "format": "uri",
+            "examples": [
+              "{\n  \"uri\": \"file.csv\"\n}\n",
+              "{\n  \"uri\": \"#/data/my-data\"\n}\n",
+              "{\n  \"uri\": \"http://example.com/file.csv\"\n}\n"
+            ],
+            "context": "Implementations need to negotiate the type of URI provided, and dereference the data accordingly. There are restrictions imposed on URIs that are POSIX paths: see [the notes on descriptors](#descriptor) for more information."
+          },
+          "email": {
+            "title": "Email",
+            "description": "An email address.",
+            "type": "string",
+            "format": "email",
+            "examples": [
+              "{\n  \"email\": \"example@example.com\"\n}\n"
+            ]
+          }
+        }
+      },
+      "examples": [
+        "{\n  \"sources\": [\n    {\n      \"name\": \"World Bank and OECD\",\n      \"uri\": \"http://data.worldbank.org/indicator/NY.GDP.MKTP.CD\"\n    }\n  ]\n}\n"
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/DatapackageTest.php b/tests/DatapackageTest.php
index 150184c..910275d 100644
--- a/tests/DatapackageTest.php
+++ b/tests/DatapackageTest.php
@@ -1,10 +1,10 @@
 <?php
+namespace frictionlessdata\datapackage\tests;
 
-
+use frictionlessdata\datapackage\DatapackageValidationError;
 use PHPUnit\Framework\TestCase;
 use frictionlessdata\datapackage\Datapackage;
 
-
 class DatapackageTest extends TestCase
 {
     public $simpleDescriptorArray;
@@ -30,61 +30,11 @@ public function setUp()
         $this->fixturesPath = dirname(__FILE__)."/fixtures";
     }
 
-    /**
-     * @param object $expectedDescriptor
-     * @param Datapackage $datapackage
-     */
-    public function assertDatapackageDescriptor($expectedDescriptor, $datapackage)
-    {
-        $this->assertEquals($expectedDescriptor, $datapackage->descriptor());
-    }
-
-    /**
-     * @param array $expectedData
-     * @param Datapackage $datapackage
-     */
-    public function assertDatapackageData($expectedData, $datapackage)
-    {
-        $allResourcesData = [];
-        foreach ($datapackage as $resource) {
-            $resourceData = [];
-            foreach ($resource as $dataStream) {
-                $data = [];
-                foreach ($dataStream as $line) {
-                    $data[] = $line;
-                }
-                $resourceData[] = $data;
-            }
-            $allResourcesData[$resource->name()] = $resourceData;
-        }
-        $this->assertEquals($expectedData, $allResourcesData);
-    }
-
-    /**
-     * @param string $source
-     * @param object $expectedDescriptor
-     * @param array $expectedData
-     */
-    public function assertDatapackage($expectedDescriptor, $expectedData, $datapackage)
-    {
-        $this->assertDatapackageDescriptor($expectedDescriptor, $datapackage);
-        $this->assertDatapackageData($expectedData, $datapackage);
-    }
-
-    public function assertDatapackageException($expectedExceptionClass, $datapackageCallback)
-    {
-        try {
-            $datapackageCallback();
-        } catch (\Exception $e) {
-            $this->assertEquals($expectedExceptionClass, get_class($e), $e->getMessage());
-        }
-    }
-
     public function testNativePHPArrayShouldFail()
     {
         $descriptorArray = $this->simpleDescriptorArray;
         $this->assertDatapackageException(
-            "frictionlessdata\\datapackage\\DatapackageInvalidSourceException",
+            "frictionlessdata\\datapackage\\Exceptions\\DatapackageInvalidSourceException",
             function() use ($descriptorArray) { new Datapackage($descriptorArray); }
         );
     }
@@ -93,7 +43,7 @@ public function testNativePHPObjectWithoutBasePathShouldFail()
     {
         $descriptor = $this->simpleDescriptor;
         $this->assertDatapackageException(
-            "frictionlessdata\\datapackage\\DataStreamOpenException",
+            "frictionlessdata\\datapackage\\Exceptions\\DataStreamOpenException",
             function() use ($descriptor) { new Datapackage($descriptor); }
         );
     }
@@ -110,7 +60,7 @@ public function testJsonStringWithoutBasePathShouldFail()
     {
         $source = json_encode($this->simpleDescriptor);
         $this->assertDatapackageException(
-            "frictionlessdata\\datapackage\\DataStreamOpenException",
+            "frictionlessdata\\datapackage\\Exceptions\\DataStreamOpenException",
             function() use ($source) { new Datapackage($source); }
         );
     }
@@ -127,7 +77,7 @@ public function testJsonStringWithBasePath()
     public function testNonExistantFileShouldFail()
     {
         $this->assertDatapackageException(
-            "frictionlessdata\\datapackage\\DatapackageInvalidSourceException",
+            "frictionlessdata\\datapackage\\Exceptions\\DatapackageInvalidSourceException",
             function() { new Datapackage("-invalid-"); }
         );
     }
@@ -157,7 +107,7 @@ public function testHttpSource()
                     (object)["name" => "resource-name", "data" => [] ]
                 ]
             ], ["resource-name" => []],
-            new MockDatapackage("mock-http://simple_valid_datapackage_no_data.json")
+            new Mocks\MockDatapackage("mock-http://simple_valid_datapackage_no_data.json")
         );
     }
 
@@ -203,27 +153,68 @@ public function testMultiDataDatapackage()
         ], $out);
     }
 
-}
-
-
-class MockDatapackage extends Datapackage {
+    public function testDatapackageValidation()
+    {
+        $this->assertEquals([], Datapackage::validate("tests/fixtures/multi_data_datapackage.json"));
+    }
 
-    protected function _isHttpSource($dataSource)
+    public function testDatapackageValidationFailed()
     {
-        return (
-            strpos($dataSource, "mock-http://") === 0
-            || parent::_isHttpSource($dataSource)
+        $this->assertEquals(
+            "[resources] The property resources is required",
+            DatapackageValidationError::getErrorMessages(
+                Datapackage::validate("tests/fixtures/simple_invalid_datapackage.json")
+            )
         );
     }
 
-    protected function _normalizeHttpSource($dataSource)
+    /**
+     * @param object $expectedDescriptor
+     * @param Datapackage $datapackage
+     */
+    protected function assertDatapackageDescriptor($expectedDescriptor, $datapackage)
+    {
+        $this->assertEquals($expectedDescriptor, $datapackage->descriptor());
+    }
+
+    /**
+     * @param array $expectedData
+     * @param Datapackage $datapackage
+     */
+    protected function assertDatapackageData($expectedData, $datapackage)
     {
-        $dataSource = parent::_normalizeHttpSource($dataSource);
-        if (strpos($dataSource, "mock-http://") === 0) {
-            $dataSource = str_replace("mock-http://", "", $dataSource);
-            $dataSource = dirname(__FILE__).DIRECTORY_SEPARATOR."fixtures".DIRECTORY_SEPARATOR.$dataSource;
+        $allResourcesData = [];
+        foreach ($datapackage as $resource) {
+            $resourceData = [];
+            foreach ($resource as $dataStream) {
+                $data = [];
+                foreach ($dataStream as $line) {
+                    $data[] = $line;
+                }
+                $resourceData[] = $data;
+            }
+            $allResourcesData[$resource->name()] = $resourceData;
         }
-        return $dataSource;
+        $this->assertEquals($expectedData, $allResourcesData);
     }
 
-}
\ No newline at end of file
+    /**
+     * @param string $source
+     * @param object $expectedDescriptor
+     * @param array $expectedData
+     */
+    protected function assertDatapackage($expectedDescriptor, $expectedData, $datapackage)
+    {
+        $this->assertDatapackageDescriptor($expectedDescriptor, $datapackage);
+        $this->assertDatapackageData($expectedData, $datapackage);
+    }
+
+    protected function assertDatapackageException($expectedExceptionClass, $datapackageCallback)
+    {
+        try {
+            $datapackageCallback();
+        } catch (\Exception $e) {
+            $this->assertEquals($expectedExceptionClass, get_class($e), $e->getMessage());
+        }
+    }
+}
diff --git a/tests/Mocks/MockDatapackage.php b/tests/Mocks/MockDatapackage.php
new file mode 100644
index 0000000..b5b1740
--- /dev/null
+++ b/tests/Mocks/MockDatapackage.php
@@ -0,0 +1,25 @@
+<?php
+namespace frictionlessdata\datapackage\tests\Mocks;
+
+use frictionlessdata\datapackage\Datapackage;
+
+class MockDatapackage extends Datapackage
+{
+    protected function isHttpSource($dataSource)
+    {
+        return (
+            strpos($dataSource, "mock-http://") === 0
+            || parent::isHttpSource($dataSource)
+        );
+    }
+
+    protected function normalizeHttpSource($dataSource)
+    {
+        $dataSource = parent::normalizeHttpSource($dataSource);
+        if (strpos($dataSource, "mock-http://") === 0) {
+            $dataSource = str_replace("mock-http://", "", $dataSource);
+            $dataSource = dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR."fixtures".DIRECTORY_SEPARATOR.$dataSource;
+        }
+        return $dataSource;
+    }
+}
\ No newline at end of file
diff --git a/tests/Mocks/MockResource.php b/tests/Mocks/MockResource.php
new file mode 100644
index 0000000..5e107d6
--- /dev/null
+++ b/tests/Mocks/MockResource.php
@@ -0,0 +1,25 @@
+<?php
+namespace frictionlessdata\datapackage\tests\Mocks;
+
+use frictionlessdata\datapackage\Resource;
+
+class MockResource extends Resource
+{
+    protected function isHttpSource($dataSource)
+    {
+        return (
+            strpos($dataSource, "mock-http://") === 0
+            || parent::isHttpSource($dataSource)
+        );
+    }
+
+    protected function normalizeDataSource($dataSource)
+    {
+        $dataSource = parent::normalizeDataSource($dataSource);
+        if (strpos($dataSource, "mock-http://") === 0) {
+            $dataSource = str_replace("mock-http://", "", $dataSource);
+            $dataSource = dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR."fixtures".DIRECTORY_SEPARATOR.$dataSource;
+        }
+        return $dataSource;
+    }
+}
diff --git a/tests/ResourceTest.php b/tests/ResourceTest.php
index 7ae7333..767e9db 100644
--- a/tests/ResourceTest.php
+++ b/tests/ResourceTest.php
@@ -1,12 +1,27 @@
 <?php
-
+namespace frictionlessdata\datapackage\tests;
 
 use PHPUnit\Framework\TestCase;
-use frictionlessdata\datapackage\Resource;
-
 
 class ResourceTest extends TestCase
 {
+    public function testHttpDataSourceShouldNotGetBasePath()
+    {
+        $this->assertResourceData(
+            [["foo"],["foo"]],
+            new Mocks\MockResource(
+                (object)[
+                    "name" => "resource-name",
+                    "data" => [
+                        "mock-http://foo.txt", // basePath will not be added to http source
+                        "foo.txt" // basePath will be added here
+                    ]
+                ],
+                dirname(__FILE__).DIRECTORY_SEPARATOR."fixtures"
+            )
+        );
+    }
+
     protected function assertResourceData($expectedData, $resource)
     {
         $actualData = [];
@@ -19,37 +34,4 @@ protected function assertResourceData($expectedData, $resource)
         }
         $this->assertEquals($expectedData, $actualData);
     }
-
-    public function testHttpDataSourceShouldNotGetBasePath()
-    {
-        $this->assertResourceData([["foo"],["foo"]], new MockResource((object)[
-            "name" => "resource-name",
-            "data" => [
-                "mock-http://foo.txt", // basePath will not be added to http source
-                "foo.txt" // basePath will be added here
-            ]
-        ], dirname(__FILE__).DIRECTORY_SEPARATOR."fixtures"));
-    }
 }
-
-
-class MockResource extends Resource
-{
-    protected function _isHttpSource($dataSource)
-    {
-        return (
-            strpos($dataSource, "mock-http://") === 0
-            || parent::_isHttpSource($dataSource)
-        );
-    }
-
-    protected function _normalizeDataSource($dataSource)
-    {
-        $dataSource = parent::_normalizeDataSource($dataSource);
-        if (strpos($dataSource, "mock-http://") === 0) {
-            $dataSource = str_replace("mock-http://", "", $dataSource);
-            $dataSource = dirname(__FILE__).DIRECTORY_SEPARATOR."fixtures".DIRECTORY_SEPARATOR.$dataSource;
-        }
-        return $dataSource;
-    }
-}
\ No newline at end of file
diff --git a/tests/autoload.php b/tests/autoload.php
new file mode 100644
index 0000000..8b3ad11
--- /dev/null
+++ b/tests/autoload.php
@@ -0,0 +1,6 @@
+<?php
+include_once __DIR__.'/../vendor/autoload.php';
+
+$classLoader = new \Composer\Autoload\ClassLoader();
+$classLoader->addPsr4("frictionlessdata\\datapackage\\tests\\", __DIR__, true);
+$classLoader->register();
diff --git a/tests/fixtures/simple_invalid_datapackage.json b/tests/fixtures/simple_invalid_datapackage.json
new file mode 100644
index 0000000..80ab287
--- /dev/null
+++ b/tests/fixtures/simple_invalid_datapackage.json
@@ -0,0 +1,3 @@
+{
+  "name": "datapackage-name"
+}
\ No newline at end of file