diff --git a/src/core/index.js b/src/core/index.js
index 7fa4407..1ff5bd5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -1,8 +1,6 @@
 /**
  * @namespace PIXI
  */
-import ImageResource from './textures/resources/ImageResource';
-
 export * from './const';
 export * from './math';
 
@@ -37,11 +35,7 @@
 export { default as FrameBuffer } from './textures/FrameBuffer';
 export { default as CubeTexture } from './textures/CubeTexture';
 export { default as BaseTexture } from './textures/BaseTexture';
-
-
-// image resource
 export { default as ImageResource } from './textures/resources/ImageResource';
-
 export { default as ArrayTexture } from './textures/ArrayTexture';
 export { default as Texture } from './textures/Texture';
 export { default as RenderTexture } from './textures/RenderTexture';

diff --git a/src/core/index.js b/src/core/index.js
index 7fa4407..1ff5bd5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -1,8 +1,6 @@
 /**
  * @namespace PIXI
  */
-import ImageResource from './textures/resources/ImageResource';
-
 export * from './const';
 export * from './math';
 
@@ -37,11 +35,7 @@
 export { default as FrameBuffer } from './textures/FrameBuffer';
 export { default as CubeTexture } from './textures/CubeTexture';
 export { default as BaseTexture } from './textures/BaseTexture';
-
-
-// image resource
 export { default as ImageResource } from './textures/resources/ImageResource';
-
 export { default as ArrayTexture } from './textures/ArrayTexture';
 export { default as Texture } from './textures/Texture';
 export { default as RenderTexture } from './textures/RenderTexture';
diff --git a/src/core/textures/Spritesheet.js b/src/core/textures/Spritesheet.js
index 7b696ff..d232195 100644
--- a/src/core/textures/Spritesheet.js
+++ b/src/core/textures/Spritesheet.js
@@ -112,11 +112,8 @@
         // For non-1 resolutions, update baseTexture
         if (resolution !== 1)
         {
-            console.log(this.baseTexture.resolution);
-
             this.baseTexture.resolution = resolution;
             this.baseTexture.updateResolution();
-            // this.baseTexture.update();
         }
 
         return resolution;

diff --git a/src/core/index.js b/src/core/index.js
index 7fa4407..1ff5bd5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -1,8 +1,6 @@
 /**
  * @namespace PIXI
  */
-import ImageResource from './textures/resources/ImageResource';
-
 export * from './const';
 export * from './math';
 
@@ -37,11 +35,7 @@
 export { default as FrameBuffer } from './textures/FrameBuffer';
 export { default as CubeTexture } from './textures/CubeTexture';
 export { default as BaseTexture } from './textures/BaseTexture';
-
-
-// image resource
 export { default as ImageResource } from './textures/resources/ImageResource';
-
 export { default as ArrayTexture } from './textures/ArrayTexture';
 export { default as Texture } from './textures/Texture';
 export { default as RenderTexture } from './textures/RenderTexture';
diff --git a/src/core/textures/Spritesheet.js b/src/core/textures/Spritesheet.js
index 7b696ff..d232195 100644
--- a/src/core/textures/Spritesheet.js
+++ b/src/core/textures/Spritesheet.js
@@ -112,11 +112,8 @@
         // For non-1 resolutions, update baseTexture
         if (resolution !== 1)
         {
-            console.log(this.baseTexture.resolution);
-
             this.baseTexture.resolution = resolution;
             this.baseTexture.updateResolution();
-            // this.baseTexture.update();
         }
 
         return resolution;
diff --git a/src/core/textures/resources/ImageResource.js b/src/core/textures/resources/ImageResource.js
index 000a29e..e3a8f03 100644
--- a/src/core/textures/resources/ImageResource.js
+++ b/src/core/textures/resources/ImageResource.js
@@ -78,9 +78,9 @@
         {
             image.crossOrigin = determineCrossOrigin(url);
         }
-        else if(crossorigin)
+        else if (crossorigin)
         {
-            image.crossOrigin = 'anonymous'
+            image.crossOrigin = 'anonymous';
         }
 
         image.src = url;

diff --git a/src/core/index.js b/src/core/index.js
index 7fa4407..1ff5bd5 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -1,8 +1,6 @@
 /**
  * @namespace PIXI
  */
-import ImageResource from './textures/resources/ImageResource';
-
 export * from './const';
 export * from './math';
 
@@ -37,11 +35,7 @@
 export { default as FrameBuffer } from './textures/FrameBuffer';
 export { default as CubeTexture } from './textures/CubeTexture';
 export { default as BaseTexture } from './textures/BaseTexture';
-
-
-// image resource
 export { default as ImageResource } from './textures/resources/ImageResource';
-
 export { default as ArrayTexture } from './textures/ArrayTexture';
 export { default as Texture } from './textures/Texture';
 export { default as RenderTexture } from './textures/RenderTexture';
diff --git a/src/core/textures/Spritesheet.js b/src/core/textures/Spritesheet.js
index 7b696ff..d232195 100644
--- a/src/core/textures/Spritesheet.js
+++ b/src/core/textures/Spritesheet.js
@@ -112,11 +112,8 @@
         // For non-1 resolutions, update baseTexture
         if (resolution !== 1)
         {
-            console.log(this.baseTexture.resolution);
-
             this.baseTexture.resolution = resolution;
             this.baseTexture.updateResolution();
-            // this.baseTexture.update();
         }
 
         return resolution;
diff --git a/src/core/textures/resources/ImageResource.js b/src/core/textures/resources/ImageResource.js
index 000a29e..e3a8f03 100644
--- a/src/core/textures/resources/ImageResource.js
+++ b/src/core/textures/resources/ImageResource.js
@@ -78,9 +78,9 @@
         {
             image.crossOrigin = determineCrossOrigin(url);
         }
-        else if(crossorigin)
+        else if (crossorigin)
         {
-            image.crossOrigin = 'anonymous'
+            image.crossOrigin = 'anonymous';
         }
 
         image.src = url;
diff --git a/test/loaders/bitmapFontParser.js b/test/loaders/bitmapFontParser.js
index 70703fc..708455f 100644
--- a/test/loaders/bitmapFontParser.js
+++ b/test/loaders/bitmapFontParser.js
@@ -119,7 +119,7 @@
         const charA = font.chars['A'.charCodeAt(0) || 65];
 
         expect(charA).to.exist;
-        expect(charA.texture.baseTexture.source).to.equal(this.fontImage);
+        expect(charA.texture.baseTexture.resource.source).to.equal(this.fontImage);
         expect(charA.texture.frame.x).to.equal(2);
         expect(charA.texture.frame.y).to.equal(2);
         expect(charA.texture.frame.width).to.equal(19);
@@ -127,7 +127,7 @@
         const charB = font.chars['B'.charCodeAt(0) || 66];
 
         expect(charB).to.exist;
-        expect(charB.texture.baseTexture.source).to.equal(this.fontImage);
+        expect(charB.texture.baseTexture.resource.source).to.equal(this.fontImage);
         expect(charB.texture.frame.x).to.equal(2);
         expect(charB.texture.frame.y).to.equal(24);
         expect(charB.texture.frame.width).to.equal(15);
@@ -135,7 +135,7 @@
         const charC = font.chars['C'.charCodeAt(0) || 67];
 
         expect(charC).to.exist;
-        expect(charC.texture.baseTexture.source).to.equal(this.fontImage);
+        expect(charC.texture.baseTexture.resource.source).to.equal(this.fontImage);
         expect(charC.texture.frame.x).to.equal(23);
         expect(charC.texture.frame.y).to.equal(2);
         expect(charC.texture.frame.width).to.equal(18);
@@ -143,7 +143,7 @@
         const charD = font.chars['D'.charCodeAt(0) || 68];
 
         expect(charD).to.exist;
-        expect(charD.texture.baseTexture.source).to.equal(this.fontImage);
+        expect(charD.texture.baseTexture.resource.source).to.equal(this.fontImage);
         expect(charD.texture.frame.x).to.equal(19);
         expect(charD.texture.frame.y).to.equal(24);
         expect(charD.texture.frame.width).to.equal(17);
@@ -165,7 +165,7 @@
         const charA = font.chars['A'.charCodeAt(0) || 65];
 
         expect(charA).to.exist;
-        expect(charA.texture.baseTexture.source).to.equal(this.fontScaledImage);
+        expect(charA.texture.baseTexture.resource.source).to.equal(this.fontScaledImage);
         expect(charA.texture.frame.x).to.equal(4); // 2 / 0.5
         expect(charA.texture.frame.y).to.equal(4); // 2 / 0.5
         expect(charA.texture.frame.width).to.equal(38); // 19 / 0.5
@@ -173,7 +173,7 @@
         const charB = font.chars['B'.charCodeAt(0) || 66];
 
         expect(charB).to.exist;
-        expect(charB.texture.baseTexture.source).to.equal(this.fontScaledImage);
+        expect(charB.texture.baseTexture.resource.source).to.equal(this.fontScaledImage);
         expect(charB.texture.frame.x).to.equal(4); // 2 / 0.5
         expect(charB.texture.frame.y).to.equal(48); // 24 / 0.5
         expect(charB.texture.frame.width).to.equal(30); // 15 / 0.5
@@ -181,7 +181,7 @@
         const charC = font.chars['C'.charCodeAt(0) || 67];
 
         expect(charC).to.exist;
-        expect(charC.texture.baseTexture.source).to.equal(this.fontScaledImage);
+        expect(charC.texture.baseTexture.resource.source).to.equal(this.fontScaledImage);
         expect(charC.texture.frame.x).to.equal(46); // 23 / 0.5
         expect(charC.texture.frame.y).to.equal(4); // 2 / 0.5
         expect(charC.texture.frame.width).to.equal(36); // 18 / 0.5
@@ -189,7 +189,7 @@
         const charD = font.chars['D'.charCodeAt(0) || 68];
 
         expect(charD).to.exist;
-        expect(charD.texture.baseTexture.source).to.equal(this.fontScaledImage);
+        expect(charD.texture.baseTexture.resource.source).to.equal(this.fontScaledImage);
         expect(charD.texture.frame.x).to.equal(38); // 19 / 0.5
         expect(charD.texture.frame.y).to.equal(48); // 24 / 0.5
         expect(charD.texture.frame.width).to.equal(34); // 17 / 0.5
@@ -218,7 +218,7 @@
             const charA = font.chars['A'.charCodeAt(0) || 65];
 
             expect(charA).to.exist;
-            expect(charA.texture.baseTexture.source).to.equal(this.atlasImage);
+            expect(charA.texture.baseTexture.resource.source).to.equal(this.atlasImage);
             expect(charA.texture.frame.x).to.equal(fontX + 2);
             expect(charA.texture.frame.y).to.equal(fontY + 2);
             expect(charA.texture.frame.width).to.equal(19);
@@ -226,7 +226,7 @@
             const charB = font.chars['B'.charCodeAt(0) || 66];
 
             expect(charB).to.exist;
-            expect(charB.texture.baseTexture.source).to.equal(this.atlasImage);
+            expect(charB.texture.baseTexture.resource.source).to.equal(this.atlasImage);
             expect(charB.texture.frame.x).to.equal(fontX + 2);
             expect(charB.texture.frame.y).to.equal(fontY + 24);
             expect(charB.texture.frame.width).to.equal(15);
@@ -234,7 +234,7 @@
             const charC = font.chars['C'.charCodeAt(0) || 67];
 
             expect(charC).to.exist;
-            expect(charC.texture.baseTexture.source).to.equal(this.atlasImage);
+            expect(charC.texture.baseTexture.resource.source).to.equal(this.atlasImage);
             expect(charC.texture.frame.x).to.equal(fontX + 23);
             expect(charC.texture.frame.y).to.equal(fontY + 2);
             expect(charC.texture.frame.width).to.equal(18);
@@ -242,7 +242,7 @@
             const charD = font.chars['D'.charCodeAt(0) || 68];
 
             expect(charD).to.exist;
-            expect(charD.texture.baseTexture.source).to.equal(this.atlasImage);
+            expect(charD.texture.baseTexture.resource.source).to.equal(this.atlasImage);
             expect(charD.texture.frame.x).to.equal(fontX + 19);
             expect(charD.texture.frame.y).to.equal(fontY + 24);
             expect(charD.texture.frame.width).to.equal(17);
@@ -259,6 +259,8 @@
         const baseTexture = new PIXI.BaseTexture(this.atlasScaledImage, null, 1);
         const spritesheet = new PIXI.Spritesheet(baseTexture, this.atlasScaledJSON);
 
+        spritesheet.resolution = 1;
+
         spritesheet.parse(() =>
         {
             const fontTexture  = PIXI.Texture.fromFrame('resources/font.png');
@@ -272,7 +274,7 @@
             const charA = font.chars['A'.charCodeAt(0) || 65];
 
             expect(charA).to.exist;
-            expect(charA.texture.baseTexture.source).to.equal(this.atlasScaledImage);
+            expect(charA.texture.baseTexture.resource.source).to.equal(this.atlasScaledImage);
             expect(charA.texture.frame.x).to.equal(fontX + 2);
             expect(charA.texture.frame.y).to.equal(fontY + 2);
             expect(charA.texture.frame.width).to.equal(19);
@@ -280,7 +282,7 @@
             const charB = font.chars['B'.charCodeAt(0) || 66];
 
             expect(charB).to.exist;
-            expect(charB.texture.baseTexture.source).to.equal(this.atlasScaledImage);
+            expect(charB.texture.baseTexture.resource.source).to.equal(this.atlasScaledImage);
             expect(charB.texture.frame.x).to.equal(fontX + 2);
             expect(charB.texture.frame.y).to.equal(fontY + 24);
             expect(charB.texture.frame.width).to.equal(15);
@@ -288,7 +290,7 @@
             const charC = font.chars['C'.charCodeAt(0) || 67];
 
             expect(charC).to.exist;
-            expect(charC.texture.baseTexture.source).to.equal(this.atlasScaledImage);
+            expect(charC.texture.baseTexture.resource.source).to.equal(this.atlasScaledImage);
             expect(charC.texture.frame.x).to.equal(fontX + 23);
             expect(charC.texture.frame.y).to.equal(fontY + 2);
             expect(charC.texture.frame.width).to.equal(18);
@@ -296,7 +298,7 @@
             const charD = font.chars['D'.charCodeAt(0) || 68];
 
             expect(charD).to.exist;
-            expect(charD.texture.baseTexture.source).to.equal(this.atlasScaledImage);
+            expect(charD.texture.baseTexture.resource.source).to.equal(this.atlasScaledImage);
             expect(charD.texture.frame.x).to.equal(fontX + 19);
             expect(charD.texture.frame.y).to.equal(fontY + 24);
             expect(charD.texture.frame.width).to.equal(17);