diff --git a/lib/src/spec/common.dart b/lib/src/spec/common.dart
index 8d70365e8..f74c65ee8 100644
--- a/lib/src/spec/common.dart
+++ b/lib/src/spec/common.dart
@@ -941,7 +941,7 @@ abstract class Channels<ChannelType> extends Iterable<ChannelType> {
   ChannelType get(String name) {
     //TODO add ChannelOptions as optional argument here,
     // and pass it on to createChannel
-    assert(name!=null, 'Channel name cannot be null');
+    assert(name != null, 'Channel name cannot be null');
     if (_channels[name] == null) {
       _channels[name] = createChannel(name, null);
     }
diff --git a/test/models/message_test.dart b/test/models/message_test.dart
index 9bbc82783..8ace856a2 100644
--- a/test/models/message_test.dart
+++ b/test/models/message_test.dart
@@ -194,7 +194,7 @@ void main() {
         });
         test('any other Object for extras is not allowed', () {
           expect(
-              () => Message(extras: Object()),
+            () => Message(extras: Object()),
             throwsA(isA<AssertionError>()),
           );
         });
diff --git a/test/models/presence_message_test.dart b/test/models/presence_message_test.dart
index 05eba09a2..77071991f 100644
--- a/test/models/presence_message_test.dart
+++ b/test/models/presence_message_test.dart
@@ -186,25 +186,25 @@ void main() {
       });
       test('a string for extras is not allowed', () {
         expect(
-            () => PresenceMessage(extras: 'extra'),
+          () => PresenceMessage(extras: 'extra'),
           throwsA(isA<AssertionError>()),
         );
       });
       test('an int for extras is not allowed', () {
         expect(
-            () => PresenceMessage(extras: 1),
+          () => PresenceMessage(extras: 1),
           throwsA(isA<AssertionError>()),
         );
       });
       test('a bool for extras is not allowed', () {
         expect(
-            () => PresenceMessage(extras: true),
+          () => PresenceMessage(extras: true),
           throwsA(isA<AssertionError>()),
         );
       });
       test('any other Object for extras is not allowed', () {
         expect(
-            () => PresenceMessage(extras: Object()),
+          () => PresenceMessage(extras: Object()),
           throwsA(isA<AssertionError>()),
         );
       });
diff --git a/test/rest/channel_test.dart b/test/rest/channel_test.dart
index 329074b50..3c2a8ed0c 100644
--- a/test/rest/channel_test.dart
+++ b/test/rest/channel_test.dart
@@ -34,7 +34,7 @@ void main() {
       // verification
       expect(manager.publishedMessages.length, 1);
       final firstMessage =
-      manager.publishedMessages.first.message as AblyMessage;
+          manager.publishedMessages.first.message as AblyMessage;
       final messageData = firstMessage.message as Map<dynamic, dynamic>;
       expect(messageData['channel'], 'test');
       expect(messageData['messages'], isA<List>());
@@ -60,7 +60,7 @@ void main() {
       // verification
       expect(manager.publishedMessages.length, 1);
       final firstMessage =
-      manager.publishedMessages.first.message as AblyMessage;
+          manager.publishedMessages.first.message as AblyMessage;
       final messageData = firstMessage.message as Map<dynamic, dynamic>;
       expect(messageData['channel'], 'test');
       expect(messageData['messages'], isA<List>());
@@ -72,7 +72,7 @@ void main() {
     test('publishes message with authCallback timing out', () async {
       // setup
       final tooMuchDelay =
-        Timeouts.retryOperationOnAuthFailure + const Duration(seconds: 2);
+          Timeouts.retryOperationOnAuthFailure + const Duration(seconds: 2);
       var authCallbackCounter = 0;
 
       Future timingOutOnceThenSucceedsAuthCallback(TokenParams token) {
@@ -116,7 +116,7 @@ void main() {
           expect(manager.publishedMessages.length, 1);
 
           final firstMessage =
-          manager.publishedMessages.first.message as AblyMessage;
+              manager.publishedMessages.first.message as AblyMessage;
           final messageData = firstMessage.message as Map<dynamic, dynamic>;
           expect(messageData['channel'], 'test');
           expect(messageData['messages'], isA<List>());
diff --git a/test/utils.dart b/test/utils.dart
index f79a9a005..8f03d7cd8 100644
--- a/test/utils.dart
+++ b/test/utils.dart
@@ -71,11 +71,11 @@ class MockMethodCallManager {
         // PlatformChannel.
         if (!isAuthenticated && clientOptions.authUrl == 'hasAuthCallback') {
           await AblyMethodCallHandler(methodChannel).onRealtimeAuthCallback(
-            AblyMessage(TokenParams(timestamp: DateTime.now()),
-              handle: handle));
+              AblyMessage(TokenParams(timestamp: DateTime.now()),
+                  handle: handle));
           isAuthenticated = true;
           throw PlatformException(
-            code: ErrorCodes.authCallbackFailure.toString());
+              code: ErrorCodes.authCallbackFailure.toString());
         }
 
         publishedMessages.add(message);
@@ -83,7 +83,7 @@ class MockMethodCallManager {
 
       default:
         return throw Exception('Unexpected method call: ${methodCall.method}'
-          ' args: ${methodCall.arguments}');
+            ' args: ${methodCall.arguments}');
     }
   }
 }