Merge remote-tracking branch 'origin' into develop

index.js

@@ -1,8 +1,8 @@
 var tests = module.exports = {};
 
 Object.defineProperties(tests, {
-  blockTests: {
+  blockchainTests: {
-    get: require('require-all').bind(this, __dirname + '/BlockTests')
+    get: require('require-all').bind(this, __dirname + '/BlockchainTests')
   },
   basicTests: {
     get: require('require-all').bind(this, __dirname + '/BasicTests/')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ethereum-tests",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "tests for ethereum",
   "main": "index.js",
   "scripts": {