diff --git a/test/uk/gov/hmrc/excisemovementcontrolsystemapi/services/AuditServiceSpec.scala b/test/uk/gov/hmrc/excisemovementcontrolsystemapi/services/AuditServiceSpec.scala
index bbae830b..cb5b8a1d 100644
--- a/test/uk/gov/hmrc/excisemovementcontrolsystemapi/services/AuditServiceSpec.scala
+++ b/test/uk/gov/hmrc/excisemovementcontrolsystemapi/services/AuditServiceSpec.scala
@@ -75,7 +75,7 @@ class AuditServiceSpec extends PlaySpec with TestXml with BeforeAndAfterEach wit
     when(appConfig.newAuditingEnabled).thenReturn(true)
     when(auditConnector.sendExtendedEvent(any)(any, any)).thenReturn(Future.successful(AuditResult.Success))
   }
-  //TODO: Can we add 'Future.failed' testing?
+
   "auditMessage" should {
 
     "silently returns right on error with log" in {
diff --git a/test/uk/gov/hmrc/excisemovementcontrolsystemapi/services/SubmissionMessageServiceSpec.scala b/test/uk/gov/hmrc/excisemovementcontrolsystemapi/services/SubmissionMessageServiceSpec.scala
index b5c719b1..6bc8ed33 100644
--- a/test/uk/gov/hmrc/excisemovementcontrolsystemapi/services/SubmissionMessageServiceSpec.scala
+++ b/test/uk/gov/hmrc/excisemovementcontrolsystemapi/services/SubmissionMessageServiceSpec.scala
@@ -102,8 +102,7 @@ class SubmissionMessageServiceSpec extends PlaySpec with ScalaFutures with Eithe
       result mustBe Right(EISSubmissionResponse("ok", "IE815", "correlationId"))
     }
 
-    //TODO: EISErrorResponseDetails!!!!!!
-    "return an EISErrorResponsePresentation" in {
+    "return an EISErrorResponseDetails" in {
       val testError =
         EISErrorResponseDetails(INTERNAL_SERVER_ERROR, Instant.now(), "message", "debug", "cId", None)