diff --git a/analysis_options.yaml b/analysis_options.yaml
index 796ecda8..4f32c7ab 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -29,10 +29,6 @@ linter:
 
     join_return_with_assignment: false
 
-    prefer_function_declarations_over_variables: false
-
-    unnecessary_string_escapes: false
-
     non_constant_identifier_names:  false
 
     constant_identifier_names: false
diff --git a/test/setup/test_data/mock_ib_raw_page_data.dart b/test/setup/test_data/mock_ib_raw_page_data.dart
index 37afecbf..cc2e6134 100644
--- a/test/setup/test_data/mock_ib_raw_page_data.dart
+++ b/test/setup/test_data/mock_ib_raw_page_data.dart
@@ -8,7 +8,7 @@ Map<String, dynamic> mockIbRawPageData1 = {
   'description': '',
   'permalink': '/',
   'content':
-      '<h1 class=\"fs-9\" id=\"interactive-book\">Interactive-Book</h1>\n\n<p class=\"fs-6 fw-300\">Learn Digital Logic Design easily.</p>\n\n<p>The Computer Logical Organization is basically the abstraction which is below the operating system and above the digital logic level.\nNow at this point, the important points are the functional units/subsystems that refer to some hardware which is made up of lower level building blocks.</p>\n\n<p>This interactive book gives a complete understanding on Computer Logical Organization starting from basic computer overview till the advanced level.\nThis book is aimed to provide the knowledge to the reader on how to analyze the combinational and sequential circuits and implement them. You can use the combinational circuit/sequential circuit/combination of both the circuits, as per the requirement.\nAfter completing this book, you will be able to implement the type of digital circuit, which is suitable for specific application.</p>\n\n<hr />\n\n<h2 id=\"audience\">Audience</h2>\n\n<p>This book is mainly prepared for the students who are interested in the concepts of digital circuits and Computer Logical Organization. Digital circuits contain a set of Logic gates and these can be operated with binary values, 0 and 1.</p>\n\n<h3 id=\"prerequisites\">Prerequisites</h3>\n<p>Before you start learning from this Book, I hope that you have some basic knowledge about computers and how they work.\nA basic idea regarding the initial concepts of Digital Electronics is enough to understand the topics covered in this tutorial.</p>\n',
+      '<h1 class="fs-9" id="interactive-book">Interactive-Book</h1>\n\n<p class="fs-6 fw-300">Learn Digital Logic Design easily.</p>\n\n<p>The Computer Logical Organization is basically the abstraction which is below the operating system and above the digital logic level.\nNow at this point, the important points are the functional units/subsystems that refer to some hardware which is made up of lower level building blocks.</p>\n\n<p>This interactive book gives a complete understanding on Computer Logical Organization starting from basic computer overview till the advanced level.\nThis book is aimed to provide the knowledge to the reader on how to analyze the combinational and sequential circuits and implement them. You can use the combinational circuit/sequential circuit/combination of both the circuits, as per the requirement.\nAfter completing this book, you will be able to implement the type of digital circuit, which is suitable for specific application.</p>\n\n<hr />\n\n<h2 id="audience">Audience</h2>\n\n<p>This book is mainly prepared for the students who are interested in the concepts of digital circuits and Computer Logical Organization. Digital circuits contain a set of Logic gates and these can be operated with binary values, 0 and 1.</p>\n\n<h3 id="prerequisites">Prerequisites</h3>\n<p>Before you start learning from this Book, I hope that you have some basic knowledge about computers and how they work.\nA basic idea regarding the initial concepts of Digital Electronics is enough to understand the topics covered in this tutorial.</p>\n',
   'dir': '/',
   'url': '/',
   'raw_content':
diff --git a/test/ui_tests/authentication/forgot_password_view_test.dart b/test/ui_tests/authentication/forgot_password_view_test.dart
index a31c2d69..644b1a15 100644
--- a/test/ui_tests/authentication/forgot_password_view_test.dart
+++ b/test/ui_tests/authentication/forgot_password_view_test.dart
@@ -42,10 +42,9 @@ void main() {
       await _pumpForgotPasswordView(tester);
       await tester.pumpAndSettle();
 
-      var _forgotPasswordImagePredicate =
-          (Widget widget) => widget is Image && widget.height == 300;
-
-      expect(find.byWidgetPredicate(_forgotPasswordImagePredicate),
+      expect(
+          find.byWidgetPredicate(
+              (Widget widget) => widget is Image && widget.height == 300),
           findsOneWidget);
       expect(find.byType(CVTextField), findsOneWidget);
       expect(find.byType(CVPrimaryButton), findsOneWidget);
diff --git a/test/ui_tests/authentication/login_view_test.dart b/test/ui_tests/authentication/login_view_test.dart
index e2ea46dc..a07d46ad 100644
--- a/test/ui_tests/authentication/login_view_test.dart
+++ b/test/ui_tests/authentication/login_view_test.dart
@@ -43,10 +43,11 @@ void main() {
       await _pumpLoginView(tester);
       await tester.pumpAndSettle();
 
-      var _loginImagePredicate =
-          (Widget widget) => widget is Image && widget.height == 300;
+      expect(
+          find.byWidgetPredicate(
+              (Widget widget) => widget is Image && widget.height == 300),
+          findsOneWidget);
 
-      expect(find.byWidgetPredicate(_loginImagePredicate), findsOneWidget);
       expect(find.byType(CVTextField), findsOneWidget);
       expect(find.byType(CVPasswordField), findsOneWidget);
       expect(find.text('Forgot Password?'), findsOneWidget);
diff --git a/test/ui_tests/authentication/signup_view_test.dart b/test/ui_tests/authentication/signup_view_test.dart
index df0dea5f..4ab16607 100644
--- a/test/ui_tests/authentication/signup_view_test.dart
+++ b/test/ui_tests/authentication/signup_view_test.dart
@@ -42,10 +42,10 @@ void main() {
       await _pumpSignupView(tester);
       await tester.pumpAndSettle();
 
-      var _signupImagePredicate =
-          (Widget widget) => widget is Image && widget.height == 300;
-
-      expect(find.byWidgetPredicate(_signupImagePredicate), findsOneWidget);
+      expect(
+          find.byWidgetPredicate(
+              (Widget widget) => widget is Image && widget.height == 300),
+          findsOneWidget);
       expect(find.byType(CVTextField), findsNWidgets(2));
       expect(find.byType(CVPasswordField), findsOneWidget);
       expect(find.byType(CVPrimaryButton), findsOneWidget);
@@ -63,10 +63,10 @@ void main() {
       await _pumpSignupView(tester);
       await tester.pumpAndSettle();
 
-      var _nameFieldPredicate =
-          (Widget widget) => widget is CVTextField && widget.label == 'Name';
-      var _emailFieldPredicate =
-          (Widget widget) => widget is CVTextField && widget.label == 'Email';
+      expect(
+          find.byWidgetPredicate((Widget widget) =>
+              widget is CVTextField && widget.label == 'Name'),
+          findsOneWidget);
 
       await tester.tap(find.byType(CVPrimaryButton));
       await tester.pumpAndSettle();
@@ -77,7 +77,9 @@ void main() {
       expect(find.text('Password can\'t be empty'), findsOneWidget);
 
       await tester.enterText(
-          find.byWidgetPredicate(_nameFieldPredicate), 'test');
+          find.byWidgetPredicate((Widget widget) =>
+              widget is CVTextField && widget.label == 'Name'),
+          'test');
       await tester.tap(find.byType(CVPrimaryButton));
       await tester.pumpAndSettle();
 
@@ -86,7 +88,9 @@ void main() {
       expect(find.text('Password can\'t be empty'), findsOneWidget);
 
       await tester.enterText(
-          find.byWidgetPredicate(_emailFieldPredicate), 'test@test.com');
+          find.byWidgetPredicate((Widget widget) =>
+              widget is CVTextField && widget.label == 'Email'),
+          'test@test.com');
       await tester.tap(find.byType(CVPrimaryButton));
       await tester.pumpAndSettle();