diff --git a/test/lib/pixi/display/DisplayObject.js b/test/lib/pixi/display/DisplayObject.js
index 1388a7f..f293035 100644
--- a/test/lib/pixi/display/DisplayObject.js
+++ b/test/lib/pixi/display/DisplayObject.js
@@ -4,8 +4,8 @@
 
     expect(obj).to.be.an.instanceof(PIXI.DisplayObject);
     expect(obj).to.respondTo('setInteractive');
-    expect(obj).to.respondTo('addFilter');
-    expect(obj).to.respondTo('removeFilter');
+    //expect(obj).to.respondTo('addFilter');
+    //expect(obj).to.respondTo('removeFilter');
     expect(obj).to.respondTo('updateTransform');
 
     expect(obj).to.have.property('last', obj);

diff --git a/test/lib/pixi/display/DisplayObject.js b/test/lib/pixi/display/DisplayObject.js
index 1388a7f..f293035 100644
--- a/test/lib/pixi/display/DisplayObject.js
+++ b/test/lib/pixi/display/DisplayObject.js
@@ -4,8 +4,8 @@
 
     expect(obj).to.be.an.instanceof(PIXI.DisplayObject);
     expect(obj).to.respondTo('setInteractive');
-    expect(obj).to.respondTo('addFilter');
-    expect(obj).to.respondTo('removeFilter');
+    //expect(obj).to.respondTo('addFilter');
+    //expect(obj).to.respondTo('removeFilter');
     expect(obj).to.respondTo('updateTransform');
 
     expect(obj).to.have.property('last', obj);
diff --git a/test/unit/pixi/display/Sprite.js b/test/unit/pixi/display/Sprite.js
index 54e914f..30c8076 100644
--- a/test/unit/pixi/display/Sprite.js
+++ b/test/unit/pixi/display/Sprite.js
@@ -8,9 +8,12 @@
     it('Module exists', function () {
         expect(Sprite).to.be.a('function');
         expect(PIXI).to.have.deep.property('blendModes.NORMAL', 0);
-        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 1);
+        expect(PIXI).to.have.deep.property('blendModes.ADD', 1);
+        expect(PIXI).to.have.deep.property('blendModes.MULTIPLY', 2);
+        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 3);
     });
 
+
     it('Members exist',  function () {
         expect(Sprite).itself.to.respondTo('fromImage');
         expect(Sprite).itself.to.respondTo('fromFrame');

diff --git a/test/lib/pixi/display/DisplayObject.js b/test/lib/pixi/display/DisplayObject.js
index 1388a7f..f293035 100644
--- a/test/lib/pixi/display/DisplayObject.js
+++ b/test/lib/pixi/display/DisplayObject.js
@@ -4,8 +4,8 @@
 
     expect(obj).to.be.an.instanceof(PIXI.DisplayObject);
     expect(obj).to.respondTo('setInteractive');
-    expect(obj).to.respondTo('addFilter');
-    expect(obj).to.respondTo('removeFilter');
+    //expect(obj).to.respondTo('addFilter');
+    //expect(obj).to.respondTo('removeFilter');
     expect(obj).to.respondTo('updateTransform');
 
     expect(obj).to.have.property('last', obj);
diff --git a/test/unit/pixi/display/Sprite.js b/test/unit/pixi/display/Sprite.js
index 54e914f..30c8076 100644
--- a/test/unit/pixi/display/Sprite.js
+++ b/test/unit/pixi/display/Sprite.js
@@ -8,9 +8,12 @@
     it('Module exists', function () {
         expect(Sprite).to.be.a('function');
         expect(PIXI).to.have.deep.property('blendModes.NORMAL', 0);
-        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 1);
+        expect(PIXI).to.have.deep.property('blendModes.ADD', 1);
+        expect(PIXI).to.have.deep.property('blendModes.MULTIPLY', 2);
+        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 3);
     });
 
+
     it('Members exist',  function () {
         expect(Sprite).itself.to.respondTo('fromImage');
         expect(Sprite).itself.to.respondTo('fromFrame');
diff --git a/test/unit/pixi/extras/CustomRenderable.js b/test/unit/pixi/extras/CustomRenderable.js
deleted file mode 100644
index 8d83cf0..0000000
--- a/test/unit/pixi/extras/CustomRenderable.js
+++ /dev/null
@@ -1,21 +0,0 @@
-describe('pixi/extras/CustomRenderable', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var CustomRenderable = PIXI.CustomRenderable;
-
-    it('Module exists', function () {
-        expect(CustomRenderable).to.be.a('function');
-    });
-
-    it('Confirm new instance', function () {
-        var obj = new CustomRenderable();
-
-        pixi_display_DisplayObject_confirmNew(obj);
-
-        expect(obj).to.be.an.instanceof(CustomRenderable);
-        expect(obj).to.respondTo('renderCanvas');
-        expect(obj).to.respondTo('initWebGL');
-        expect(obj).to.respondTo('renderWebGL');
-    });
-});

diff --git a/test/lib/pixi/display/DisplayObject.js b/test/lib/pixi/display/DisplayObject.js
index 1388a7f..f293035 100644
--- a/test/lib/pixi/display/DisplayObject.js
+++ b/test/lib/pixi/display/DisplayObject.js
@@ -4,8 +4,8 @@
 
     expect(obj).to.be.an.instanceof(PIXI.DisplayObject);
     expect(obj).to.respondTo('setInteractive');
-    expect(obj).to.respondTo('addFilter');
-    expect(obj).to.respondTo('removeFilter');
+    //expect(obj).to.respondTo('addFilter');
+    //expect(obj).to.respondTo('removeFilter');
     expect(obj).to.respondTo('updateTransform');
 
     expect(obj).to.have.property('last', obj);
diff --git a/test/unit/pixi/display/Sprite.js b/test/unit/pixi/display/Sprite.js
index 54e914f..30c8076 100644
--- a/test/unit/pixi/display/Sprite.js
+++ b/test/unit/pixi/display/Sprite.js
@@ -8,9 +8,12 @@
     it('Module exists', function () {
         expect(Sprite).to.be.a('function');
         expect(PIXI).to.have.deep.property('blendModes.NORMAL', 0);
-        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 1);
+        expect(PIXI).to.have.deep.property('blendModes.ADD', 1);
+        expect(PIXI).to.have.deep.property('blendModes.MULTIPLY', 2);
+        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 3);
     });
 
+
     it('Members exist',  function () {
         expect(Sprite).itself.to.respondTo('fromImage');
         expect(Sprite).itself.to.respondTo('fromFrame');
diff --git a/test/unit/pixi/extras/CustomRenderable.js b/test/unit/pixi/extras/CustomRenderable.js
deleted file mode 100644
index 8d83cf0..0000000
--- a/test/unit/pixi/extras/CustomRenderable.js
+++ /dev/null
@@ -1,21 +0,0 @@
-describe('pixi/extras/CustomRenderable', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var CustomRenderable = PIXI.CustomRenderable;
-
-    it('Module exists', function () {
-        expect(CustomRenderable).to.be.a('function');
-    });
-
-    it('Confirm new instance', function () {
-        var obj = new CustomRenderable();
-
-        pixi_display_DisplayObject_confirmNew(obj);
-
-        expect(obj).to.be.an.instanceof(CustomRenderable);
-        expect(obj).to.respondTo('renderCanvas');
-        expect(obj).to.respondTo('initWebGL');
-        expect(obj).to.respondTo('renderWebGL');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLBatch.js b/test/unit/pixi/renderers/webgl/WebGLBatch.js
deleted file mode 100644
index 75efd56..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLBatch.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLBatch', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLBatch = PIXI.WebGLBatch;
-
-    it('Module exists', function () {
-        expect(WebGLBatch).to.be.a('function');
-    });
-});

diff --git a/test/lib/pixi/display/DisplayObject.js b/test/lib/pixi/display/DisplayObject.js
index 1388a7f..f293035 100644
--- a/test/lib/pixi/display/DisplayObject.js
+++ b/test/lib/pixi/display/DisplayObject.js
@@ -4,8 +4,8 @@
 
     expect(obj).to.be.an.instanceof(PIXI.DisplayObject);
     expect(obj).to.respondTo('setInteractive');
-    expect(obj).to.respondTo('addFilter');
-    expect(obj).to.respondTo('removeFilter');
+    //expect(obj).to.respondTo('addFilter');
+    //expect(obj).to.respondTo('removeFilter');
     expect(obj).to.respondTo('updateTransform');
 
     expect(obj).to.have.property('last', obj);
diff --git a/test/unit/pixi/display/Sprite.js b/test/unit/pixi/display/Sprite.js
index 54e914f..30c8076 100644
--- a/test/unit/pixi/display/Sprite.js
+++ b/test/unit/pixi/display/Sprite.js
@@ -8,9 +8,12 @@
     it('Module exists', function () {
         expect(Sprite).to.be.a('function');
         expect(PIXI).to.have.deep.property('blendModes.NORMAL', 0);
-        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 1);
+        expect(PIXI).to.have.deep.property('blendModes.ADD', 1);
+        expect(PIXI).to.have.deep.property('blendModes.MULTIPLY', 2);
+        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 3);
     });
 
+
     it('Members exist',  function () {
         expect(Sprite).itself.to.respondTo('fromImage');
         expect(Sprite).itself.to.respondTo('fromFrame');
diff --git a/test/unit/pixi/extras/CustomRenderable.js b/test/unit/pixi/extras/CustomRenderable.js
deleted file mode 100644
index 8d83cf0..0000000
--- a/test/unit/pixi/extras/CustomRenderable.js
+++ /dev/null
@@ -1,21 +0,0 @@
-describe('pixi/extras/CustomRenderable', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var CustomRenderable = PIXI.CustomRenderable;
-
-    it('Module exists', function () {
-        expect(CustomRenderable).to.be.a('function');
-    });
-
-    it('Confirm new instance', function () {
-        var obj = new CustomRenderable();
-
-        pixi_display_DisplayObject_confirmNew(obj);
-
-        expect(obj).to.be.an.instanceof(CustomRenderable);
-        expect(obj).to.respondTo('renderCanvas');
-        expect(obj).to.respondTo('initWebGL');
-        expect(obj).to.respondTo('renderWebGL');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLBatch.js b/test/unit/pixi/renderers/webgl/WebGLBatch.js
deleted file mode 100644
index 75efd56..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLBatch.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLBatch', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLBatch = PIXI.WebGLBatch;
-
-    it('Module exists', function () {
-        expect(WebGLBatch).to.be.a('function');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js b/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js
deleted file mode 100644
index f4ee366..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLRenderGroup', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLRenderGroup = PIXI.WebGLRenderGroup;
-
-    it('Module exists', function () {
-        expect(WebGLRenderGroup).to.be.a('function');
-    });
-});

diff --git a/test/lib/pixi/display/DisplayObject.js b/test/lib/pixi/display/DisplayObject.js
index 1388a7f..f293035 100644
--- a/test/lib/pixi/display/DisplayObject.js
+++ b/test/lib/pixi/display/DisplayObject.js
@@ -4,8 +4,8 @@
 
     expect(obj).to.be.an.instanceof(PIXI.DisplayObject);
     expect(obj).to.respondTo('setInteractive');
-    expect(obj).to.respondTo('addFilter');
-    expect(obj).to.respondTo('removeFilter');
+    //expect(obj).to.respondTo('addFilter');
+    //expect(obj).to.respondTo('removeFilter');
     expect(obj).to.respondTo('updateTransform');
 
     expect(obj).to.have.property('last', obj);
diff --git a/test/unit/pixi/display/Sprite.js b/test/unit/pixi/display/Sprite.js
index 54e914f..30c8076 100644
--- a/test/unit/pixi/display/Sprite.js
+++ b/test/unit/pixi/display/Sprite.js
@@ -8,9 +8,12 @@
     it('Module exists', function () {
         expect(Sprite).to.be.a('function');
         expect(PIXI).to.have.deep.property('blendModes.NORMAL', 0);
-        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 1);
+        expect(PIXI).to.have.deep.property('blendModes.ADD', 1);
+        expect(PIXI).to.have.deep.property('blendModes.MULTIPLY', 2);
+        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 3);
     });
 
+
     it('Members exist',  function () {
         expect(Sprite).itself.to.respondTo('fromImage');
         expect(Sprite).itself.to.respondTo('fromFrame');
diff --git a/test/unit/pixi/extras/CustomRenderable.js b/test/unit/pixi/extras/CustomRenderable.js
deleted file mode 100644
index 8d83cf0..0000000
--- a/test/unit/pixi/extras/CustomRenderable.js
+++ /dev/null
@@ -1,21 +0,0 @@
-describe('pixi/extras/CustomRenderable', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var CustomRenderable = PIXI.CustomRenderable;
-
-    it('Module exists', function () {
-        expect(CustomRenderable).to.be.a('function');
-    });
-
-    it('Confirm new instance', function () {
-        var obj = new CustomRenderable();
-
-        pixi_display_DisplayObject_confirmNew(obj);
-
-        expect(obj).to.be.an.instanceof(CustomRenderable);
-        expect(obj).to.respondTo('renderCanvas');
-        expect(obj).to.respondTo('initWebGL');
-        expect(obj).to.respondTo('renderWebGL');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLBatch.js b/test/unit/pixi/renderers/webgl/WebGLBatch.js
deleted file mode 100644
index 75efd56..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLBatch.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLBatch', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLBatch = PIXI.WebGLBatch;
-
-    it('Module exists', function () {
-        expect(WebGLBatch).to.be.a('function');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js b/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js
deleted file mode 100644
index f4ee366..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLRenderGroup', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLRenderGroup = PIXI.WebGLRenderGroup;
-
-    it('Module exists', function () {
-        expect(WebGLRenderGroup).to.be.a('function');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLShaders.js b/test/unit/pixi/renderers/webgl/WebGLShaders.js
index 4459958..6e33e4f 100644
--- a/test/unit/pixi/renderers/webgl/WebGLShaders.js
+++ b/test/unit/pixi/renderers/webgl/WebGLShaders.js
@@ -4,14 +4,7 @@
     var expect = chai.expect;
 
     it('Module members exist', function () {
-        expect(PIXI).to.respondTo('initDefaultShaders');
-
-        expect(PIXI).to.respondTo('activatePrimitiveShader');
-        expect(PIXI).to.respondTo('deactivatePrimitiveShader');
-
-        expect(PIXI).to.respondTo('activateStripShader');
-        expect(PIXI).to.respondTo('deactivateStripShader');
-
+       
         expect(PIXI).to.respondTo('CompileVertexShader');
         expect(PIXI).to.respondTo('CompileFragmentShader');
         expect(PIXI).to.respondTo('_CompileShader');

diff --git a/test/lib/pixi/display/DisplayObject.js b/test/lib/pixi/display/DisplayObject.js
index 1388a7f..f293035 100644
--- a/test/lib/pixi/display/DisplayObject.js
+++ b/test/lib/pixi/display/DisplayObject.js
@@ -4,8 +4,8 @@
 
     expect(obj).to.be.an.instanceof(PIXI.DisplayObject);
     expect(obj).to.respondTo('setInteractive');
-    expect(obj).to.respondTo('addFilter');
-    expect(obj).to.respondTo('removeFilter');
+    //expect(obj).to.respondTo('addFilter');
+    //expect(obj).to.respondTo('removeFilter');
     expect(obj).to.respondTo('updateTransform');
 
     expect(obj).to.have.property('last', obj);
diff --git a/test/unit/pixi/display/Sprite.js b/test/unit/pixi/display/Sprite.js
index 54e914f..30c8076 100644
--- a/test/unit/pixi/display/Sprite.js
+++ b/test/unit/pixi/display/Sprite.js
@@ -8,9 +8,12 @@
     it('Module exists', function () {
         expect(Sprite).to.be.a('function');
         expect(PIXI).to.have.deep.property('blendModes.NORMAL', 0);
-        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 1);
+        expect(PIXI).to.have.deep.property('blendModes.ADD', 1);
+        expect(PIXI).to.have.deep.property('blendModes.MULTIPLY', 2);
+        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 3);
     });
 
+
     it('Members exist',  function () {
         expect(Sprite).itself.to.respondTo('fromImage');
         expect(Sprite).itself.to.respondTo('fromFrame');
diff --git a/test/unit/pixi/extras/CustomRenderable.js b/test/unit/pixi/extras/CustomRenderable.js
deleted file mode 100644
index 8d83cf0..0000000
--- a/test/unit/pixi/extras/CustomRenderable.js
+++ /dev/null
@@ -1,21 +0,0 @@
-describe('pixi/extras/CustomRenderable', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var CustomRenderable = PIXI.CustomRenderable;
-
-    it('Module exists', function () {
-        expect(CustomRenderable).to.be.a('function');
-    });
-
-    it('Confirm new instance', function () {
-        var obj = new CustomRenderable();
-
-        pixi_display_DisplayObject_confirmNew(obj);
-
-        expect(obj).to.be.an.instanceof(CustomRenderable);
-        expect(obj).to.respondTo('renderCanvas');
-        expect(obj).to.respondTo('initWebGL');
-        expect(obj).to.respondTo('renderWebGL');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLBatch.js b/test/unit/pixi/renderers/webgl/WebGLBatch.js
deleted file mode 100644
index 75efd56..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLBatch.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLBatch', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLBatch = PIXI.WebGLBatch;
-
-    it('Module exists', function () {
-        expect(WebGLBatch).to.be.a('function');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js b/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js
deleted file mode 100644
index f4ee366..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLRenderGroup', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLRenderGroup = PIXI.WebGLRenderGroup;
-
-    it('Module exists', function () {
-        expect(WebGLRenderGroup).to.be.a('function');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLShaders.js b/test/unit/pixi/renderers/webgl/WebGLShaders.js
index 4459958..6e33e4f 100644
--- a/test/unit/pixi/renderers/webgl/WebGLShaders.js
+++ b/test/unit/pixi/renderers/webgl/WebGLShaders.js
@@ -4,14 +4,7 @@
     var expect = chai.expect;
 
     it('Module members exist', function () {
-        expect(PIXI).to.respondTo('initDefaultShaders');
-
-        expect(PIXI).to.respondTo('activatePrimitiveShader');
-        expect(PIXI).to.respondTo('deactivatePrimitiveShader');
-
-        expect(PIXI).to.respondTo('activateStripShader');
-        expect(PIXI).to.respondTo('deactivateStripShader');
-
+       
         expect(PIXI).to.respondTo('CompileVertexShader');
         expect(PIXI).to.respondTo('CompileFragmentShader');
         expect(PIXI).to.respondTo('_CompileShader');
diff --git a/test/unit/pixi/renderers/webgl/WebGLSpriteBatch.js b/test/unit/pixi/renderers/webgl/WebGLSpriteBatch.js
new file mode 100644
index 0000000..e662b63
--- /dev/null
+++ b/test/unit/pixi/renderers/webgl/WebGLSpriteBatch.js
@@ -0,0 +1,10 @@
+describe('renderers/webgl/utils/WebGLSpriteBatch', function () {
+    'use strict';
+
+    var expect = chai.expect;
+    var WebGLSpriteBatch = PIXI.WebGLSpriteBatch;
+
+    it('Module exists', function () {
+        expect(WebGLSpriteBatch).to.be.a('function');
+    });
+});

diff --git a/test/lib/pixi/display/DisplayObject.js b/test/lib/pixi/display/DisplayObject.js
index 1388a7f..f293035 100644
--- a/test/lib/pixi/display/DisplayObject.js
+++ b/test/lib/pixi/display/DisplayObject.js
@@ -4,8 +4,8 @@
 
     expect(obj).to.be.an.instanceof(PIXI.DisplayObject);
     expect(obj).to.respondTo('setInteractive');
-    expect(obj).to.respondTo('addFilter');
-    expect(obj).to.respondTo('removeFilter');
+    //expect(obj).to.respondTo('addFilter');
+    //expect(obj).to.respondTo('removeFilter');
     expect(obj).to.respondTo('updateTransform');
 
     expect(obj).to.have.property('last', obj);
diff --git a/test/unit/pixi/display/Sprite.js b/test/unit/pixi/display/Sprite.js
index 54e914f..30c8076 100644
--- a/test/unit/pixi/display/Sprite.js
+++ b/test/unit/pixi/display/Sprite.js
@@ -8,9 +8,12 @@
     it('Module exists', function () {
         expect(Sprite).to.be.a('function');
         expect(PIXI).to.have.deep.property('blendModes.NORMAL', 0);
-        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 1);
+        expect(PIXI).to.have.deep.property('blendModes.ADD', 1);
+        expect(PIXI).to.have.deep.property('blendModes.MULTIPLY', 2);
+        expect(PIXI).to.have.deep.property('blendModes.SCREEN', 3);
     });
 
+
     it('Members exist',  function () {
         expect(Sprite).itself.to.respondTo('fromImage');
         expect(Sprite).itself.to.respondTo('fromFrame');
diff --git a/test/unit/pixi/extras/CustomRenderable.js b/test/unit/pixi/extras/CustomRenderable.js
deleted file mode 100644
index 8d83cf0..0000000
--- a/test/unit/pixi/extras/CustomRenderable.js
+++ /dev/null
@@ -1,21 +0,0 @@
-describe('pixi/extras/CustomRenderable', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var CustomRenderable = PIXI.CustomRenderable;
-
-    it('Module exists', function () {
-        expect(CustomRenderable).to.be.a('function');
-    });
-
-    it('Confirm new instance', function () {
-        var obj = new CustomRenderable();
-
-        pixi_display_DisplayObject_confirmNew(obj);
-
-        expect(obj).to.be.an.instanceof(CustomRenderable);
-        expect(obj).to.respondTo('renderCanvas');
-        expect(obj).to.respondTo('initWebGL');
-        expect(obj).to.respondTo('renderWebGL');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLBatch.js b/test/unit/pixi/renderers/webgl/WebGLBatch.js
deleted file mode 100644
index 75efd56..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLBatch.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLBatch', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLBatch = PIXI.WebGLBatch;
-
-    it('Module exists', function () {
-        expect(WebGLBatch).to.be.a('function');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js b/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js
deleted file mode 100644
index f4ee366..0000000
--- a/test/unit/pixi/renderers/webgl/WebGLRenderGroup.js
+++ /dev/null
@@ -1,10 +0,0 @@
-describe('renderers/webgl/WebGLRenderGroup', function () {
-    'use strict';
-
-    var expect = chai.expect;
-    var WebGLRenderGroup = PIXI.WebGLRenderGroup;
-
-    it('Module exists', function () {
-        expect(WebGLRenderGroup).to.be.a('function');
-    });
-});
diff --git a/test/unit/pixi/renderers/webgl/WebGLShaders.js b/test/unit/pixi/renderers/webgl/WebGLShaders.js
index 4459958..6e33e4f 100644
--- a/test/unit/pixi/renderers/webgl/WebGLShaders.js
+++ b/test/unit/pixi/renderers/webgl/WebGLShaders.js
@@ -4,14 +4,7 @@
     var expect = chai.expect;
 
     it('Module members exist', function () {
-        expect(PIXI).to.respondTo('initDefaultShaders');
-
-        expect(PIXI).to.respondTo('activatePrimitiveShader');
-        expect(PIXI).to.respondTo('deactivatePrimitiveShader');
-
-        expect(PIXI).to.respondTo('activateStripShader');
-        expect(PIXI).to.respondTo('deactivateStripShader');
-
+       
         expect(PIXI).to.respondTo('CompileVertexShader');
         expect(PIXI).to.respondTo('CompileFragmentShader');
         expect(PIXI).to.respondTo('_CompileShader');
diff --git a/test/unit/pixi/renderers/webgl/WebGLSpriteBatch.js b/test/unit/pixi/renderers/webgl/WebGLSpriteBatch.js
new file mode 100644
index 0000000..e662b63
--- /dev/null
+++ b/test/unit/pixi/renderers/webgl/WebGLSpriteBatch.js
@@ -0,0 +1,10 @@
+describe('renderers/webgl/utils/WebGLSpriteBatch', function () {
+    'use strict';
+
+    var expect = chai.expect;
+    var WebGLSpriteBatch = PIXI.WebGLSpriteBatch;
+
+    it('Module exists', function () {
+        expect(WebGLSpriteBatch).to.be.a('function');
+    });
+});
diff --git a/test/unit/pixi/textures/Texture.js b/test/unit/pixi/textures/Texture.js
index adb2875..090f64d 100644
--- a/test/unit/pixi/textures/Texture.js
+++ b/test/unit/pixi/textures/Texture.js
@@ -16,7 +16,7 @@
         expect(Texture).itself.to.respondTo('addTextureToCache');
         expect(Texture).itself.to.respondTo('removeTextureFromCache');
 
-        expect(Texture).itself.to.have.deep.property('frameUpdates.length', 0);
+      //  expect(Texture).itself.to.have.deep.property('frameUpdates.length', 0);
     });
 
     it('Confirm new instance', function (done) {