diff --git a/test/async_test.dart b/test/async_test.dart
index ad52855..d15963d 100644
--- a/test/async_test.dart
+++ b/test/async_test.dart
@@ -161,7 +161,7 @@ void main() {
     /// We call [signalReady] before the last has completed
     expect(
       () => getIt.signalReady(null),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -222,7 +222,7 @@ void main() {
     /// We call [signalReady] before the last has completed
     expect(
       () => getIt.signalReady(null),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
   test('all ready ignoring pending async Singletons', () async {
@@ -396,7 +396,7 @@ void main() {
       instanceName: 'Second Instance',
     );
 
-    expect(getIt.allReady(), throwsA(isA<StateError>()));
+    expect(getIt.allReady(), throwsStateError);
   });
   test('ready manual synchronisation of sequence', () async {
     final getIt = GetIt.instance;
@@ -639,7 +639,7 @@ void main() {
     try {
       await getIt.allReady(timeout: const Duration(seconds: 1));
     } catch (ex) {
-      expect(ex, const TypeMatcher<WaitingTimeOutException>());
+      expect(ex, isA<WaitingTimeOutException>());
       final timeOut = ex as WaitingTimeOutException;
       expect(timeOut.notReadyYet.contains('null : TestClass'), true);
       expect(timeOut.notReadyYet.contains('null : TestClass2'), true);
@@ -666,7 +666,7 @@ void main() {
     );
 
     final instance = await getIt.getAsync<TestClass>();
-    expect(instance, const TypeMatcher<TestClass>());
+    expect(instance, isA<TestClass>());
   });
 
   test('register factory with one Param', () async {
@@ -765,7 +765,7 @@ void main() {
 
     expect(
       () => getIt.getAsync<TestClassParam>(param1: 'abc', param2: '3'),
-      throwsA(const TypeMatcher<TypeError>()),
+      throwsA(isA<TypeError>()),
     );
   });
 
@@ -781,7 +781,7 @@ void main() {
 
     expect(
       () => getIt.getAsync<TestClassParam>(),
-      throwsA(const TypeMatcher<TypeError>()),
+      throwsA(isA<TypeError>()),
     );
   });
 
@@ -795,7 +795,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<AssertionError>()),
+      throwsA(isA<AssertionError>()),
     );
   });
 
@@ -810,7 +810,7 @@ void main() {
     await Future.delayed(const Duration(microseconds: 1));
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -823,7 +823,7 @@ void main() {
     );
 
     final instance = await getIt.getAsync<TestClass>();
-    expect(instance, const TypeMatcher<TestClass>());
+    expect(instance, isA<TestClass>());
   });
 
   test('asyncLazySingleton called with get after wait for ready', () async {
@@ -838,7 +838,7 @@ void main() {
     await getIt.isReady<TestClass>(timeout: const Duration(milliseconds: 20));
 
     final instance2 = getIt.get<TestClass>();
-    expect(instance2, const TypeMatcher<TestClass>());
+    expect(instance2, isA<TestClass>());
   });
 
   test('isReady called on asyncLazySingleton ', () async {
@@ -852,7 +852,7 @@ void main() {
     await getIt.isReady<TestClass>(timeout: const Duration(milliseconds: 20));
 
     final instance = getIt.get<TestClass>();
-    expect(instance, const TypeMatcher<TestClass>());
+    expect(instance, isA<TestClass>());
   });
 
   group("dependency", () {
diff --git a/test/get_it_test.dart b/test/get_it_test.dart
index 3077731..fcadac5 100644
--- a/test/get_it_test.dart
+++ b/test/get_it_test.dart
@@ -180,7 +180,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClassParam>(param1: 'abc', param2: '3'),
-      throwsA(const TypeMatcher<TypeError>()),
+      throwsA(isA<TypeError>()),
     );
   });
 
@@ -195,7 +195,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClassParam>(param2: '3'),
-      throwsA(const TypeMatcher<TypeError>()),
+      throwsA(isA<TypeError>()),
     );
   });
 
@@ -251,7 +251,7 @@ void main() {
     await getIt.reset();
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     expect(destructorCounter, 1);
@@ -266,7 +266,7 @@ void main() {
     await getIt.reset();
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     expect(disposeCounter, 1);
@@ -343,7 +343,7 @@ void main() {
 
     expect(
       () => getIt.get<int>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     GetIt.I.reset();
@@ -442,7 +442,7 @@ void main() {
 
     expect(
       () => getIt(instanceName: 'not there'),
-      throwsA(const TypeMatcher<AssertionError>()),
+      throwsA(isA<AssertionError>()),
     );
     GetIt.I.reset();
   });
@@ -702,7 +702,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -738,7 +738,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -773,7 +773,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -808,7 +808,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -839,7 +839,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
   test('testing reference counting', () async {
@@ -880,7 +880,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
   test('testing reference counting - unregister', () async {
@@ -921,7 +921,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -949,15 +949,15 @@ void main() {
 
     expect(
       () => getIt<TestClass>(instanceName: 'instanceName'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       getIt<TestClass>(instanceName: 'instanceName2'),
-      const TypeMatcher<TestClass>(),
+      isA<TestClass>(),
     );
     expect(
       getIt<TestClass2>(instanceName: 'instanceName'),
-      const TypeMatcher<TestClass2>(),
+      isA<TestClass2>(),
     );
   });
 
@@ -984,7 +984,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -1011,7 +1011,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -1040,7 +1040,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClassDisposable>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -1061,7 +1061,7 @@ void main() {
 
     expect(
       () => getIt<TestClass>(instanceName: 'instanceName'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
   test('change registration name with type and name', () async {
@@ -1083,11 +1083,11 @@ void main() {
 
     expect(
       () => getIt<TestClass>(instanceName: 'instanceName'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       getIt<TestClass>(instanceName: 'instanceName2'),
-      const TypeMatcher<TestClass>(),
+      isA<TestClass>(),
     );
   });
 
@@ -1108,7 +1108,7 @@ void main() {
           newInstanceName: 'instanceNameExisting',
         );
       },
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -1131,11 +1131,11 @@ void main() {
 
     expect(
       () => getIt<TestClass>(instanceName: 'instanceName'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       getIt<TestClass>(instanceName: 'instanceName2'),
-      const TypeMatcher<TestClass>(),
+      isA<TestClass>(),
     );
   });
 
@@ -1196,7 +1196,7 @@ void main() {
 
     final Injector instance = GetIt.I<Injector>();
 
-    expect(instance, const TypeMatcher<Injector>());
+    expect(instance, isA<Injector>());
   });
 
   test('deregister in the same order of registering', () async {
@@ -1257,7 +1257,7 @@ void main() {
 
     expect(
       () => getIt<TestClassDisposableWithDependency>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     await getIt.unregister<TestClassDisposable>();
diff --git a/test/scope_test.dart b/test/scope_test.dart
index 40fe675..7971550 100644
--- a/test/scope_test.dart
+++ b/test/scope_test.dart
@@ -82,7 +82,7 @@ void main() {
 
     getIt.unregister<TestClass2>();
 
-    expect(() => getIt.get<TestClass2>(), throwsA(isA<StateError>()));
+    expect(() => getIt.get<TestClass2>(), throwsStateError);
   });
 
   test('register constant in two scopes', () {
@@ -358,7 +358,7 @@ void main() {
     expect(instanceTestClassScope1.id, 'Basescope');
     expect(
       () => getIt.get<TestClass2>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -387,7 +387,7 @@ void main() {
     expect(instanceTestClassScope1.id, 'Basescope');
     expect(
       () => getIt.get<TestClass2>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
   test('popscopeuntil inclusive=false', () async {
@@ -415,7 +415,7 @@ void main() {
     expect(instanceTestClassScope1.id, '2. scope');
     expect(
       () => getIt.get<TestClass2>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
   });
 
@@ -477,7 +477,7 @@ void main() {
   test('popscope throws if already on the base scope', () async {
     final getIt = GetIt.instance;
 
-    expect(() => getIt.popScope(), throwsA(const TypeMatcher<StateError>()));
+    expect(() => getIt.popScope(), throwsStateError);
   });
 
   test('dropScope', () async {
@@ -504,7 +504,7 @@ void main() {
     expect(instanceTestClassScope1.id, 'Basescope');
     expect(
       () => getIt.get<TestClass2>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     final instanceTestClass3Scope3 = getIt.get<TestClass3>();
@@ -517,7 +517,7 @@ void main() {
     getIt.pushNewScope(scopeName: 'scope2');
     await expectLater(
       () => getIt.dropScope('scope'),
-      throwsA(const TypeMatcher<ArgumentError>()),
+      throwsA(isA<ArgumentError>()),
     );
   });
 
@@ -541,7 +541,7 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(getIt.get<TestClass2>(), isNotNull);
   });
@@ -584,7 +584,7 @@ void main() {
     expect(getIt<TestClass>(instanceName: 'scope2'), isNotNull);
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope3'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     expect(disposeCounter, 2);
@@ -635,7 +635,7 @@ void main() {
     expect(getIt<TestClass>(instanceName: 'scope2'), isNotNull);
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope3'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     expect(disposeCounter, 0);
@@ -682,19 +682,19 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope0'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope1'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope2'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope3'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     expect(disposeCounter, 7);
@@ -759,19 +759,19 @@ void main() {
 
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope0'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope1'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope2'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
     expect(
       () => getIt.get<TestClass>(instanceName: 'scope3'),
-      throwsA(const TypeMatcher<StateError>()),
+      throwsStateError,
     );
 
     expect(disposeCounter, 0);