diff --git a/test/dartemis/core/aspect_test.dart b/test/dartemis/core/aspect_test.dart
index 8da8462..9d29bd7 100644
--- a/test/dartemis/core/aspect_test.dart
+++ b/test/dartemis/core/aspect_test.dart
@@ -11,56 +11,56 @@ void main() {
     test('getAspectForAll with one component', () {
       final aspect = Aspect.forAllOf([PooledComponentC]);
       expect(aspect.all, componentCBit);
-      expect(aspect.excluded, 0);
-      expect(aspect.one, 0);
+      expect(aspect.excluded, BigInt.zero);
+      expect(aspect.one, BigInt.zero);
     });
     test('getAspectForAll with all components', () {
       final aspect =
           Aspect.forAllOf([ComponentA, ComponentB, PooledComponentC]);
       expect(aspect.all, componentABit | componentBBit | componentCBit);
-      expect(aspect.excluded, 0);
-      expect(aspect.one, 0);
+      expect(aspect.excluded, BigInt.zero);
+      expect(aspect.one, BigInt.zero);
     });
     test('getAspectForAll with one component, excluding another one', () {
       final aspect = Aspect.forAllOf([PooledComponentC])..exclude([ComponentA]);
       expect(aspect.all, componentCBit);
       expect(aspect.excluded, componentABit);
-      expect(aspect.one, 0);
+      expect(aspect.one, BigInt.zero);
     });
     test('getAspectForAll with one component, excluding another two', () {
       final aspect = Aspect.forAllOf([PooledComponentC])
         ..exclude([ComponentA, ComponentB]);
       expect(aspect.all, componentCBit);
       expect(aspect.excluded, componentABit | componentBBit);
-      expect(aspect.one, 0);
+      expect(aspect.one, BigInt.zero);
     });
     test('getAspectForAll with one component, and one of two', () {
       final aspect = Aspect.forAllOf([PooledComponentC])
         ..oneOf([ComponentA, ComponentB]);
       expect(aspect.all, componentCBit);
-      expect(aspect.excluded, 0);
+      expect(aspect.excluded, BigInt.zero);
       expect(aspect.one, componentABit | componentBBit);
     });
     test('getAspectForOne with all components', () {
       final aspect =
           Aspect.forOneOf([ComponentA, ComponentB, PooledComponentC]);
-      expect(aspect.all, 0);
-      expect(aspect.excluded, 0);
+      expect(aspect.all, BigInt.zero);
+      expect(aspect.excluded, BigInt.zero);
       expect(aspect.one, componentABit | componentBBit | componentCBit);
     });
     test('getAspectForOne with chaining each component', () {
       final aspect = Aspect.forOneOf([ComponentA])
         ..oneOf([ComponentB])
         ..oneOf([PooledComponentC]);
-      expect(aspect.all, 0);
-      expect(aspect.excluded, 0);
+      expect(aspect.all, BigInt.zero);
+      expect(aspect.excluded, BigInt.zero);
       expect(aspect.one, componentABit | componentBBit | componentCBit);
     });
     test('getEmpty()', () {
       final aspect = Aspect.empty();
-      expect(aspect.all, 0);
-      expect(aspect.excluded, 0);
-      expect(aspect.one, 0);
+      expect(aspect.all, BigInt.zero);
+      expect(aspect.excluded, BigInt.zero);
+      expect(aspect.one, BigInt.zero);
     });
   });
 }
diff --git a/test/dartemis/core/components_setup.dart b/test/dartemis/core/components_setup.dart
index faf19fb..8b09ccf 100644
--- a/test/dartemis/core/components_setup.dart
+++ b/test/dartemis/core/components_setup.dart
@@ -2,9 +2,9 @@ library components_setup;
 
 import "package:dartemis/dartemis.dart";
 
-const int componentABit = 0x0001;
-const int componentBBit = 0x0002;
-const int componentCBit = 0x0004;
+final BigInt componentABit = BigInt.from(0x0001);
+final BigInt componentBBit = BigInt.from(0x0002);
+final BigInt componentCBit = BigInt.from(0x0004);
 
 void setUpComponents() {
   ComponentTypeManager.getBit(ComponentA);