diff --git a/test/markdown_toolbar_test.dart b/test/markdown_toolbar_test.dart
index d29d3b9d..b093b0e5 100644
--- a/test/markdown_toolbar_test.dart
+++ b/test/markdown_toolbar_test.dart
@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'package:flutter/material.dart';
 
 import 'package:test/test.dart';
@@ -8,11 +6,11 @@ import 'package:gitjournal/widgets/markdown_toolbar.dart';
 
 void main() {
   void _testLine({
-    @required String before,
-    @required int beforeOffset,
-    @required String after,
-    @required int afterOffset,
-    @required String char,
+    required String before,
+    required int beforeOffset,
+    required String after,
+    required int afterOffset,
+    required String char,
   }) {
     var val = TextEditingValue(
       text: before,
@@ -28,10 +26,10 @@ void main() {
   }
 
   void _testH1({
-    @required String before,
-    @required int beforeOffset,
-    @required String after,
-    @required int afterOffset,
+    required String before,
+    required int beforeOffset,
+    required String after,
+    required int afterOffset,
   }) {
     _testLine(
       before: before,
@@ -130,11 +128,11 @@ void main() {
   // Word based
   //
   void _testWord({
-    @required String before,
-    @required int beforeOffset,
-    @required String after,
-    @required int afterOffset,
-    @required String char,
+    required String before,
+    required int beforeOffset,
+    required String after,
+    required int afterOffset,
+    required String char,
   }) {
     var val = TextEditingValue(
       text: before,
diff --git a/test/md_yaml_codec_test.dart b/test/md_yaml_codec_test.dart
index 4c5e7053..a16f722c 100644
--- a/test/md_yaml_codec_test.dart
+++ b/test/md_yaml_codec_test.dart
@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'dart:collection';
 
 import 'package:test/test.dart';
diff --git a/test/md_yaml_doc_loader_test.dart b/test/md_yaml_doc_loader_test.dart
index cd497820..844405bc 100644
--- a/test/md_yaml_doc_loader_test.dart
+++ b/test/md_yaml_doc_loader_test.dart
@@ -1,16 +1,15 @@
-// @dart=2.9
-
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
+import 'package:gitjournal/core/md_yaml_doc.dart';
 import 'package:gitjournal/core/md_yaml_doc_loader.dart';
 
 void main() {
   group('MdYamlDocLoader', () {
-    Directory tempDir;
-    String filePath;
+    late Directory tempDir;
+    late String filePath;
     var contents = """---
 type: Journal
 foo: bar
@@ -30,7 +29,7 @@ Alright.""";
 
     test('Should load one doc', () async {
       var loader = MdYamlDocLoader();
-      var doc = await loader.loadDoc(filePath);
+      var doc = (await loader.loadDoc(filePath)) as MdYamlDoc;
 
       expect(doc.body, "Alright.");
       expect(doc.props["type"], "Journal");