diff --git a/packages/orm/angel_orm_postgres/pubspec.yaml b/packages/orm/angel_orm_postgres/pubspec.yaml
index aeaf94a1..36667d6f 100644
--- a/packages/orm/angel_orm_postgres/pubspec.yaml
+++ b/packages/orm/angel_orm_postgres/pubspec.yaml
@@ -14,9 +14,5 @@ dev_dependencies:
   angel3_pretty_logging: ^3.0.0
   test: ^1.17.0
   pedantic: ^1.11.0
-  angel3_orm_test:
-    git: 
-      url: https://github.com/dukefirehawk/angel.git
-      ref: angel3
-      path: packages/orm/angel_orm_test
+  angel3_orm_test: ^3.0.0
 
diff --git a/packages/orm/angel_orm_test/lib/src/custom_expr_test.dart b/packages/orm/angel_orm_test/lib/src/custom_expr_test.dart
index 96538535..4ab71f94 100644
--- a/packages/orm/angel_orm_test/lib/src/custom_expr_test.dart
+++ b/packages/orm/angel_orm_test/lib/src/custom_expr_test.dart
@@ -6,7 +6,7 @@ import 'models/custom_expr.dart';
 void customExprTests(FutureOr<QueryExecutor> Function() createExecutor,
     {FutureOr<void> Function(QueryExecutor)? close}) {
   late QueryExecutor executor;
-  Numbers? numbersModel;
+  late Numbers numbersModel;
 
   close ??= (_) => null;
 
@@ -27,16 +27,16 @@ void customExprTests(FutureOr<QueryExecutor> Function() createExecutor,
   tearDown(() => close!(executor));
 
   test('fetches correct result', () async {
-    expect(numbersModel?.two, 2);
+    expect(numbersModel.two, 2);
   });
 
   test('in relation', () async {
     var abcQuery = AlphabetQuery();
     abcQuery.values
       ..value = 'abc'
-      ..numbersId = numbersModel!.idAsInt
-      ..createdAt = numbersModel!.createdAt
-      ..updatedAt = numbersModel!.updatedAt;
+      ..numbersId = numbersModel.idAsInt
+      ..createdAt = numbersModel.createdAt
+      ..updatedAt = numbersModel.updatedAt;
     var abcOpt = await (abcQuery.insert(executor));
     expect(abcOpt.isPresent, true);
     abcOpt.ifPresent((abc) {