diff --git a/app/uk/gov/hmrc/helptosavestub/config/AppConfig.scala b/app/uk/gov/hmrc/helptosavestub/config/AppConfig.scala
index 80f5115..b52039e 100644
--- a/app/uk/gov/hmrc/helptosavestub/config/AppConfig.scala
+++ b/app/uk/gov/hmrc/helptosavestub/config/AppConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/BARSController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/BARSController.scala
index d629779..fa00bbb 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/BARSController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/BARSController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/BankDetailsBehaviour.scala b/app/uk/gov/hmrc/helptosavestub/controllers/BankDetailsBehaviour.scala
index e00cbf1..66640aa 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/BankDetailsBehaviour.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/BankDetailsBehaviour.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,37 +28,31 @@ trait BankDetailsBehaviour {
   val allowedSeparators: Set[Char] = Set(' ', '-', '–', '−', '—')
 
   def getBankProfile(bankDetails: BankDetails): Profile = {
-    val accountNumberWithSortCodeIsValid =
-      if (bankDetails.accountNumber.startsWith("9")) {
-        Some(false)
-      } else if (bankDetails.accountNumber.startsWith("5")) {
-        None
-      } else if (!validateSortCode(bankDetails.sortCode)) {
-        Some(false)
-      } else if (!validateAccountNumber(bankDetails.accountNumber)) {
-        Some(false)
-      } else {
-        Some(true)
-      }
+    val accountNumberWithSortCodeIsValid = bankDetails match {
+      case BankDetails(_, accountNumber) if accountNumber.startsWith("9")         => Some(false)
+      case BankDetails(_, accountNumber) if accountNumber.startsWith("5")         => None
+      case BankDetails(sortCode, _) if !validateSortCode(sortCode)                => Some(false)
+      case BankDetails(_, accountNumber) if !validateAccountNumber(accountNumber) => Some(false)
+      case _                                                                      => Some(true)
+    }
 
     val sortCodeIsPresentOnEISCD =
-      if (bankDetails.sortCode.startsWith("9")) {
-        "no"
-      } else if (bankDetails.sortCode.startsWith("5")) {
-        "whoopsie"
-      } else {
-        "yes"
+      bankDetails match {
+        case BankDetails(_, accountNumber) if accountNumber.startsWith("9") => "no"
+        case BankDetails(_, accountNumber) if accountNumber.startsWith("5") => "whoopsie"
+        case _                                                              => "yes"
       }
 
     val barsResponse =
       accountNumberWithSortCodeIsValid.map(a ⇒ BARSResponse(a, sortCodeIsPresentOnEISCD))
 
-    if (bankDetails.accountNumber.startsWith("707")) {
-      Profile(barsResponse, CreateAccountResponse(Left(NSIErrorResponse.incorrectAccountNumber)))
-    } else if (bankDetails.sortCode.startsWith("70-3")) {
-      Profile(barsResponse, CreateAccountResponse(Left(NSIErrorResponse.incorrectSortCode)))
-    } else {
-      Profile(barsResponse, CreateAccountResponse(Right(())))
+    bankDetails match {
+      case BankDetails(_, accountNumber) if accountNumber.startsWith("707") =>
+        Profile(barsResponse, CreateAccountResponse(Left(NSIErrorResponse.incorrectAccountNumber)))
+      case BankDetails(sortCode, _) if sortCode.startsWith("70-3") =>
+        Profile(barsResponse, CreateAccountResponse(Left(NSIErrorResponse.incorrectSortCode)))
+      case _ =>
+        Profile(barsResponse, CreateAccountResponse(Right(())))
     }
   }
 
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/DESController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/DESController.scala
index 407ed0f..d2c949d 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/DESController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/DESController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/DESThresholdController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/DESThresholdController.scala
index d4e0a18..45c40ad 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/DESThresholdController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/DESThresholdController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/DWPController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/DWPController.scala
index c5d2e16..877a6a2 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/DWPController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/DWPController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/DWPEligibilityBehaviour.scala b/app/uk/gov/hmrc/helptosavestub/controllers/DWPEligibilityBehaviour.scala
index 159f647..a5a52be 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/DWPEligibilityBehaviour.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/DWPEligibilityBehaviour.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckController.scala
index 6a40e16..f19e8bb 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/EmailVerificationController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/EmailVerificationController.scala
index 24cf4b5..40502f8 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/EmailVerificationController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/EmailVerificationController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/ITMPEnrolmentController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/ITMPEnrolmentController.scala
index 97c441f..edd1d82 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/ITMPEnrolmentController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/ITMPEnrolmentController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/NSIController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/NSIController.scala
index f1daab6..ae1b209 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/NSIController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/NSIController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import cats.data.Validated.{Invalid, Valid}
 import cats.data.{Validated, ValidatedNel}
 import cats.instances.string._
 import cats.syntax.apply._
-import cats.syntax.either._
 import cats.syntax.eq._
 import com.google.inject.{Inject, Singleton}
 import org.scalacheck.Gen
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetAccountBehaviour.scala b/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetAccountBehaviour.scala
index a6d190e..0d64f82 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetAccountBehaviour.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetAccountBehaviour.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetTransactionsBehaviour.scala b/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetTransactionsBehaviour.scala
index 39604c0..445d133 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetTransactionsBehaviour.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetTransactionsBehaviour.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsController.scala
index 405636d..665a138 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsController.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/package.scala b/app/uk/gov/hmrc/helptosavestub/controllers/package.scala
index a30b4c9..b91357b 100644
--- a/app/uk/gov/hmrc/helptosavestub/controllers/package.scala
+++ b/app/uk/gov/hmrc/helptosavestub/controllers/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/models/BankDetails.scala b/app/uk/gov/hmrc/helptosavestub/models/BankDetails.scala
index b5a1b83..4fb54b0 100644
--- a/app/uk/gov/hmrc/helptosavestub/models/BankDetails.scala
+++ b/app/uk/gov/hmrc/helptosavestub/models/BankDetails.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/models/ContactPreference.scala b/app/uk/gov/hmrc/helptosavestub/models/ContactPreference.scala
index bacd31e..4533330 100644
--- a/app/uk/gov/hmrc/helptosavestub/models/ContactPreference.scala
+++ b/app/uk/gov/hmrc/helptosavestub/models/ContactPreference.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/models/NSIErrorResponse.scala b/app/uk/gov/hmrc/helptosavestub/models/NSIErrorResponse.scala
index a734a5d..23d2ebd 100644
--- a/app/uk/gov/hmrc/helptosavestub/models/NSIErrorResponse.scala
+++ b/app/uk/gov/hmrc/helptosavestub/models/NSIErrorResponse.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/models/NSIPayload.scala b/app/uk/gov/hmrc/helptosavestub/models/NSIPayload.scala
index fc45d49..c4604ee 100644
--- a/app/uk/gov/hmrc/helptosavestub/models/NSIPayload.scala
+++ b/app/uk/gov/hmrc/helptosavestub/models/NSIPayload.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/util/Delays.scala b/app/uk/gov/hmrc/helptosavestub/util/Delays.scala
index 762e1fa..e45e732 100644
--- a/app/uk/gov/hmrc/helptosavestub/util/Delays.scala
+++ b/app/uk/gov/hmrc/helptosavestub/util/Delays.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/util/ErrorJson.scala b/app/uk/gov/hmrc/helptosavestub/util/ErrorJson.scala
index 2faeab6..bab8e97 100644
--- a/app/uk/gov/hmrc/helptosavestub/util/ErrorJson.scala
+++ b/app/uk/gov/hmrc/helptosavestub/util/ErrorJson.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/util/Logging.scala b/app/uk/gov/hmrc/helptosavestub/util/Logging.scala
index f735046..891fa73 100644
--- a/app/uk/gov/hmrc/helptosavestub/util/Logging.scala
+++ b/app/uk/gov/hmrc/helptosavestub/util/Logging.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/app/uk/gov/hmrc/helptosavestub/util/package.scala b/app/uk/gov/hmrc/helptosavestub/util/package.scala
index 0ff9ef8..9d1a49c 100644
--- a/app/uk/gov/hmrc/helptosavestub/util/package.scala
+++ b/app/uk/gov/hmrc/helptosavestub/util/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/conf/application.conf b/conf/application.conf
index f952402..1985889 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -1,4 +1,4 @@
-# Copyright 2020 HM Revenue & Customs
+# Copyright 2021 HM Revenue & Customs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/BARSControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/BARSControllerSpec.scala
index fe2c28a..ff38713 100644
--- a/test/uk/gov/hmrc/helptosavestub/controllers/BARSControllerSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/controllers/BARSControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/DESThresholdControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/DESThresholdControllerSpec.scala
index 3d4a72c..ed94002 100644
--- a/test/uk/gov/hmrc/helptosavestub/controllers/DESThresholdControllerSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/controllers/DESThresholdControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/DWPControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/DWPControllerSpec.scala
index 7cc1f01..ef809c5 100644
--- a/test/uk/gov/hmrc/helptosavestub/controllers/DWPControllerSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/controllers/DWPControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckControllerSpec.scala
index 825b15f..874da1e 100644
--- a/test/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckControllerSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/NSIControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/NSIControllerSpec.scala
index dec50ce..3e5196b 100644
--- a/test/uk/gov/hmrc/helptosavestub/controllers/NSIControllerSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/controllers/NSIControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsControllerSpec.scala
index eda12ad..461cee9 100644
--- a/test/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsControllerSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/TestSupport.scala b/test/uk/gov/hmrc/helptosavestub/controllers/TestSupport.scala
index ed4ebe0..49ebdca 100644
--- a/test/uk/gov/hmrc/helptosavestub/controllers/TestSupport.scala
+++ b/test/uk/gov/hmrc/helptosavestub/controllers/TestSupport.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/support/AkkaMaterializerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/support/AkkaMaterializerSpec.scala
index 4625e7b..e5d583d 100644
--- a/test/uk/gov/hmrc/helptosavestub/controllers/support/AkkaMaterializerSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/controllers/support/AkkaMaterializerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/uk/gov/hmrc/helptosavestub/util/DelaysSpec.scala b/test/uk/gov/hmrc/helptosavestub/util/DelaysSpec.scala
index 184fd61..7b68c18 100644
--- a/test/uk/gov/hmrc/helptosavestub/util/DelaysSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/util/DelaysSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import org.scalatest.matchers.should.Matchers
 
 import uk.gov.hmrc.helptosavestub.util.Delays.DelayConfig
 
-import scala.concurrent.{Await, ExecutionContext, Future, TimeoutException}
+import scala.concurrent.{Await, Future, TimeoutException}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 
diff --git a/test/uk/gov/hmrc/helptosavestub/util/UnitSpec.scala b/test/uk/gov/hmrc/helptosavestub/util/UnitSpec.scala
index ec347ee..cbea60e 100644
--- a/test/uk/gov/hmrc/helptosavestub/util/UnitSpec.scala
+++ b/test/uk/gov/hmrc/helptosavestub/util/UnitSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.