diff --git a/app/test/entity/file/data_source2_test.dart b/app/test/entity/file/data_source2_test.dart
index 0a152272..9472c3c6 100644
--- a/app/test/entity/file/data_source2_test.dart
+++ b/app/test/entity/file/data_source2_test.dart
@@ -173,7 +173,7 @@ Future<void> _getFileDescriptorsExtraShareFolder() async {
   expect(
     await src.getFileDescriptors(
         account, file_util.unstripPath(account, "test2")),
-    [files[2].toDescriptor(), files[4].toDescriptor()],
+    [files[4].toDescriptor(), files[2].toDescriptor()],
   );
 }
 
diff --git a/codegen_build/test/np_subject_accessor_test.dart b/codegen_build/test/np_subject_accessor_test.dart
index 9d39f474..ba7318fc 100644
--- a/codegen_build/test/np_subject_accessor_test.dart
+++ b/codegen_build/test/np_subject_accessor_test.dart
@@ -7,8 +7,8 @@ import 'package:path/path.dart' as p;
 import 'package:source_gen/source_gen.dart';
 import 'package:test/test.dart';
 
-void main() {
-  _resolveCompilationUnit("test/src/np_subject_accessor.dart");
+Future<void> main() async {
+  await _resolveCompilationUnit("test/src/np_subject_accessor.dart");
   tearDown(() {
     // Increment this after each test so the next test has it's own package
     _pkgCacheCount++;
diff --git a/np_db_sqlite/test/database/file_extension_test.dart b/np_db_sqlite/test/database/file_extension_test.dart
index bfdac635..f24b319a 100644
--- a/np_db_sqlite/test/database/file_extension_test.dart
+++ b/np_db_sqlite/test/database/file_extension_test.dart
@@ -1,4 +1,5 @@
 import 'package:np_common/object_util.dart';
+import 'package:np_datetime/np_datetime.dart';
 import 'package:np_db_sqlite/src/database.dart';
 import 'package:np_db_sqlite/src/database_extension.dart';
 import 'package:test/test.dart';
@@ -76,8 +77,8 @@ Future<void> _countFileGroupsByDate() async {
   expect(
     result.dateCount,
     {
-      DateTime(2024, 1, 2): 2,
-      DateTime(2024, 1, 3): 1,
+      Date(2024, 1, 2): 2,
+      Date(2024, 1, 3): 1,
     },
   );
 }