diff --git a/app/controllers/adjustments/AdjustmentsCheckYourAnswersController.scala b/app/controllers/adjustments/AdjustmentsCheckYourAnswersController.scala
index 82b47f86..13cebc1c 100644
--- a/app/controllers/adjustments/AdjustmentsCheckYourAnswersController.scala
+++ b/app/controllers/adjustments/AdjustmentsCheckYourAnswersController.scala
@@ -55,7 +55,7 @@ class AdjustmentsCheckYourAnswersController @Inject() (
           PropertyIncomeAllowanceSummary.row(taxYear, request.userAnswers, Rentals),
           RenovationAllowanceBalancingChargeSummary.row(taxYear, request.userAnswers, Rentals),
           ResidentialFinanceCostSummary.row(taxYear, request.userAnswers, Rentals),
-          UnusedResidentialFinanceCostSummary.row(taxYear, request.userAnswers)
+          UnusedResidentialFinanceCostSummary.row(taxYear, request.userAnswers, Rentals)
         ).flatten
       )
 
diff --git a/app/controllers/adjustments/UnusedResidentialFinanceCostController.scala b/app/controllers/adjustments/UnusedResidentialFinanceCostController.scala
index 5bfbe508..102ec93b 100644
--- a/app/controllers/adjustments/UnusedResidentialFinanceCostController.scala
+++ b/app/controllers/adjustments/UnusedResidentialFinanceCostController.scala
@@ -18,7 +18,7 @@ package controllers.adjustments
 
 import controllers.actions._
 import forms.adjustments.UnusedResidentialFinanceCostFormProvider
-import models.{Mode, UserAnswers}
+import models.{Mode, PropertyType, UserAnswers}
 import navigation.Navigator
 import pages.adjustments.UnusedResidentialFinanceCostPage
 import play.api.i18n.{I18nSupport, MessagesApi}
@@ -31,46 +31,48 @@ import views.html.adjustments.UnusedResidentialFinanceCostView
 import javax.inject.Inject
 import scala.concurrent.{ExecutionContext, Future}
 
-class UnusedResidentialFinanceCostController @Inject()(
-                                                        override val messagesApi: MessagesApi,
-                                                        sessionRepository: SessionRepository,
-                                                        navigator: Navigator,
-                                                        identify: IdentifierAction,
-                                                        getData: DataRetrievalAction,
-                                                        requireData: DataRequiredAction,
-                                                        formProvider: UnusedResidentialFinanceCostFormProvider,
-                                                        val controllerComponents: MessagesControllerComponents,
-                                                        view: UnusedResidentialFinanceCostView,
-                                                        sessionService: SessionService
-                                                      )(implicit ec: ExecutionContext) extends FrontendBaseController with I18nSupport {
+class UnusedResidentialFinanceCostController @Inject() (
+  override val messagesApi: MessagesApi,
+  sessionRepository: SessionRepository,
+  navigator: Navigator,
+  identify: IdentifierAction,
+  getData: DataRetrievalAction,
+  requireData: DataRequiredAction,
+  formProvider: UnusedResidentialFinanceCostFormProvider,
+  val controllerComponents: MessagesControllerComponents,
+  view: UnusedResidentialFinanceCostView,
+  sessionService: SessionService
+)(implicit ec: ExecutionContext)
+    extends FrontendBaseController with I18nSupport {
 
-
-  def onPageLoad(taxYear: Int, mode: Mode): Action[AnyContent] = (identify andThen getData) {
-    implicit request =>
-      val form = formProvider(request.user.isAgentMessageKey)
-      if (request.userAnswers.isEmpty) {
-        sessionService.createNewEmptySession(request.userId)
-      }
-      val preparedForm = request.userAnswers.getOrElse(UserAnswers(request.userId)).get(UnusedResidentialFinanceCostPage) match {
-        case None => form
+  def onPageLoad(taxYear: Int, mode: Mode, propertyType: PropertyType): Action[AnyContent] = (identify andThen getData) { implicit request =>
+    val form = formProvider(request.user.isAgentMessageKey)
+    if (request.userAnswers.isEmpty) {
+      sessionService.createNewEmptySession(request.userId)
+    }
+    val preparedForm =
+      request.userAnswers.getOrElse(UserAnswers(request.userId)).get(UnusedResidentialFinanceCostPage(propertyType)) match {
+        case None        => form
         case Some(value) => form.fill(value)
       }
 
-      Ok(view(preparedForm, taxYear, mode))
+    Ok(view(preparedForm, taxYear, mode, propertyType))
   }
 
-  def onSubmit(taxYear: Int, mode: Mode): Action[AnyContent] = (identify andThen getData andThen requireData).async {
+  def onSubmit(taxYear: Int, mode: Mode, propertyType: PropertyType): Action[AnyContent] = (identify andThen getData andThen requireData).async {
     implicit request =>
       val form = formProvider(request.user.isAgentMessageKey)
-      form.bindFromRequest().fold(
-        formWithErrors =>
-          Future.successful(BadRequest(view(formWithErrors, taxYear, mode))),
-
-        value =>
-          for {
-            updatedAnswers <- Future.fromTry(request.userAnswers.set(UnusedResidentialFinanceCostPage, value))
-            _ <- sessionRepository.set(updatedAnswers)
-          } yield Redirect(navigator.nextPage(UnusedResidentialFinanceCostPage, taxYear, mode, request.userAnswers, updatedAnswers))
-      )
+      form
+        .bindFromRequest()
+        .fold(
+          formWithErrors => Future.successful(BadRequest(view(formWithErrors, taxYear, mode, propertyType))),
+          value =>
+            for {
+              updatedAnswers <- Future.fromTry(request.userAnswers.set(UnusedResidentialFinanceCostPage(propertyType), value))
+              _              <- sessionRepository.set(updatedAnswers)
+            } yield Redirect(
+              navigator.nextPage(UnusedResidentialFinanceCostPage(propertyType), taxYear, mode, request.userAnswers, updatedAnswers)
+            )
+        )
   }
 }
diff --git a/app/controllers/session/PropertyPeriodSessionRecoveryExtensions.scala b/app/controllers/session/PropertyPeriodSessionRecoveryExtensions.scala
index 31f398b6..3b56d407 100644
--- a/app/controllers/session/PropertyPeriodSessionRecoveryExtensions.scala
+++ b/app/controllers/session/PropertyPeriodSessionRecoveryExtensions.scala
@@ -112,7 +112,7 @@ object PropertyPeriodSessionRecoveryExtensions {
             ua3 <- ua2.set(PropertyIncomeAllowancePage(Rentals), adjustments.propertyIncomeAllowance)
             ua4 <- ua3.set(RenovationAllowanceBalancingChargePage(Rentals), adjustments.renovationAllowanceBalancingCharge)
             ua5 <- ua4.set(ResidentialFinanceCostPage(Rentals), adjustments.residentialFinanceCost)
-            ua6 <- ua5.set(UnusedResidentialFinanceCostPage, adjustments.unusedResidentialFinanceCost)
+            ua6 <- ua5.set(UnusedResidentialFinanceCostPage(Rentals), adjustments.unusedResidentialFinanceCost)
           } yield ua6
       }
 
diff --git a/app/navigation/Navigator.scala b/app/navigation/Navigator.scala
index 847a7555..88a2d9de 100644
--- a/app/navigation/Navigator.scala
+++ b/app/navigation/Navigator.scala
@@ -164,8 +164,8 @@ class Navigator @Inject() () {
     case RenovationAllowanceBalancingChargePage(Rentals) =>
       taxYear => _ => _ => ResidentialFinanceCostController.onPageLoad(taxYear, NormalMode, Rentals)
     case ResidentialFinanceCostPage(Rentals) =>
-      taxYear => _ => _ => UnusedResidentialFinanceCostController.onPageLoad(taxYear, NormalMode)
-    case UnusedResidentialFinanceCostPage =>
+      taxYear => _ => _ => UnusedResidentialFinanceCostController.onPageLoad(taxYear, NormalMode, Rentals)
+    case UnusedResidentialFinanceCostPage(Rentals) =>
       taxYear =>
         _ =>
           _ =>
@@ -487,7 +487,7 @@ class Navigator @Inject() () {
         // Adjustments
     case PrivateUseAdjustmentPage(Rentals) | PropertyIncomeAllowancePage(Rentals) | RenovationAllowanceBalancingChargePage(
           Rentals
-        ) | ResidentialFinanceCostPage(Rentals) | UnusedResidentialFinanceCostPage =>
+        ) | ResidentialFinanceCostPage(Rentals) | UnusedResidentialFinanceCostPage(Rentals) =>
       taxYear => _ => _ => AdjustmentsCheckYourAnswersController.onPageLoad(taxYear)
     case BalancingChargePage(Rentals) =>
       taxYear =>
diff --git a/app/pages/adjustments/UnusedResidentialFinanceCostPage.scala b/app/pages/adjustments/UnusedResidentialFinanceCostPage.scala
index f8bd3eb4..dc984fac 100644
--- a/app/pages/adjustments/UnusedResidentialFinanceCostPage.scala
+++ b/app/pages/adjustments/UnusedResidentialFinanceCostPage.scala
@@ -16,14 +16,14 @@
 
 package pages.adjustments
 
-import models.Rentals
+import models.{PropertyType, Rentals}
 import pages.PageConstants.adjustmentsPath
 import pages.QuestionPage
 import play.api.libs.json.JsPath
 
-case object UnusedResidentialFinanceCostPage extends QuestionPage[BigDecimal] {
+case class UnusedResidentialFinanceCostPage(propertyType: PropertyType) extends QuestionPage[BigDecimal] {
 
-  override def path: JsPath = JsPath \ adjustmentsPath(Rentals) \ toString
+  override def path: JsPath = JsPath \ adjustmentsPath(propertyType) \ toString
 
   override def toString: String = "unusedResidentialFinanceCost"
 }
diff --git a/app/viewmodels/checkAnswers/adjustments/UnusedResidentialFinanceCostSummary.scala b/app/viewmodels/checkAnswers/adjustments/UnusedResidentialFinanceCostSummary.scala
index f0b705fc..3210fc5e 100644
--- a/app/viewmodels/checkAnswers/adjustments/UnusedResidentialFinanceCostSummary.scala
+++ b/app/viewmodels/checkAnswers/adjustments/UnusedResidentialFinanceCostSummary.scala
@@ -17,7 +17,7 @@
 package viewmodels.checkAnswers.adjustments
 
 import controllers.adjustments.routes
-import models.{CheckMode, UserAnswers}
+import models.{CheckMode, PropertyType, UserAnswers}
 import pages.adjustments.UnusedResidentialFinanceCostPage
 import play.api.i18n.Messages
 import uk.gov.hmrc.govukfrontend.views.viewmodels.summarylist.SummaryListRow
@@ -27,15 +27,15 @@ import viewmodels.implicits._
 
 object UnusedResidentialFinanceCostSummary  {
 
-  def row(taxYear: Int, answers: UserAnswers)(implicit messages: Messages): Option[SummaryListRow] =
-    answers.get(UnusedResidentialFinanceCostPage).map {
+  def row(taxYear: Int, answers: UserAnswers, propertyType: PropertyType)(implicit messages: Messages): Option[SummaryListRow] =
+    answers.get(UnusedResidentialFinanceCostPage(propertyType)).map {
       answer =>
 
         SummaryListRowViewModel(
           key     = KeyViewModel("unusedResidentialFinanceCost.checkYourAnswersLabel")withCssClass(keyCssClass),
           value   = ValueViewModel(bigDecimalCurrency(answer)).withCssClass(valueCssClass),
           actions = Seq(
-            ActionItemViewModel("site.change", routes.UnusedResidentialFinanceCostController.onPageLoad(taxYear, CheckMode).url)
+            ActionItemViewModel("site.change", routes.UnusedResidentialFinanceCostController.onPageLoad(taxYear, CheckMode, propertyType).url)
               .withVisuallyHiddenText(messages("unusedResidentialFinanceCost.change.hidden"))
           )
         )
diff --git a/app/views/adjustments/UnusedResidentialFinanceCostView.scala.html b/app/views/adjustments/UnusedResidentialFinanceCostView.scala.html
index acf65357..5f427a98 100644
--- a/app/views/adjustments/UnusedResidentialFinanceCostView.scala.html
+++ b/app/views/adjustments/UnusedResidentialFinanceCostView.scala.html
@@ -27,33 +27,26 @@
 )
 
 
-@(form: Form[_], taxYear: Int, mode: Mode)(implicit request: Request[_], messages: Messages)
+@(form: Form[_], taxYear: Int, mode: Mode, propertyType: PropertyType )(implicit request: Request[_], messages: Messages)
 
 @layout(pageTitle = title(form, messages("unusedResidentialFinanceCost.title"))) {
 
     <h1 class="govuk-heading-l">@messages("unusedResidentialFinanceCost.heading")</h1>
 
-    @formHelper(action = routes.UnusedResidentialFinanceCostController.onSubmit(taxYear, mode), Symbol("autoComplete") -> "off") {
+    @formHelper(action = routes.UnusedResidentialFinanceCostController.onSubmit(taxYear, mode, propertyType), Symbol("autoComplete") -> "off") {
 
         @if(form.errors.nonEmpty) {
             @govukErrorSummary(ErrorSummaryViewModel(form))
         }
 
-        <details class="govuk-details" data-module="govuk-details">
-            <summary class="govuk-details__summary">
-                <span class="govuk-details__summary-text">
-                @messages("unusedResidentialFinanceCost.details.content.text")
-                </span>
-            </summary>
-            <div class="govuk-details__text">
+
                 <p class="govuk-body">@messages("unusedResidentialFinanceCost.details.content.link.content")</p>
                 <p class="govuk-body">@messages("unusedResidentialFinanceCost.details.content.link.intro")
                     <a href="@messages("unusedResidentialFinanceCost.details.content.link.href")" class="govuk-link" target="_blank" rel="noreferrer noopener">
                     @messages("unusedResidentialFinanceCost.details.content.link.text")
                     </a>
                 </p>
-            </div>
-        </details>
+
 
         @govukInput(
             InputViewModel(
diff --git a/conf/app.routes b/conf/app.routes
index 61655118..cf685ba4 100644
--- a/conf/app.routes
+++ b/conf/app.routes
@@ -150,10 +150,10 @@ POST        /:taxYear/rentals/adjustments/residential-finance-cost
 GET         /:taxYear/rentals/adjustments/change-residential-finance-cost                                       controllers.adjustments.ResidentialFinanceCostController.onPageLoad(taxYear: Int, mode: Mode = CheckMode, propertyType: PropertyType = Rentals)
 POST        /:taxYear/rentals/adjustments/change-residential-finance-cost                                       controllers.adjustments.ResidentialFinanceCostController.onSubmit(taxYear: Int, mode: Mode = CheckMode, propertyType: PropertyType = Rentals)
 
-GET         /:taxYear/rentals/adjustments/unused-residential-finance-cost                                       controllers.adjustments.UnusedResidentialFinanceCostController.onPageLoad(taxYear: Int, mode: Mode = NormalMode)
-POST        /:taxYear/rentals/adjustments/unused-residential-finance-cost                                       controllers.adjustments.UnusedResidentialFinanceCostController.onSubmit(taxYear: Int, mode: Mode = NormalMode)
-GET         /:taxYear/rentals/adjustments/change-unused-residential-finance-cost                                controllers.adjustments.UnusedResidentialFinanceCostController.onPageLoad(taxYear: Int, mode: Mode = CheckMode)
-POST        /:taxYear/rentals/adjustments/change-unused-residential-finance-cost                                controllers.adjustments.UnusedResidentialFinanceCostController.onSubmit(taxYear: Int, mode: Mode = CheckMode)
+GET         /:taxYear/rentals/adjustments/unused-residential-finance-cost                                       controllers.adjustments.UnusedResidentialFinanceCostController.onPageLoad(taxYear: Int, mode: Mode = NormalMode, propertyType: PropertyType = Rentals)
+POST        /:taxYear/rentals/adjustments/unused-residential-finance-cost                                       controllers.adjustments.UnusedResidentialFinanceCostController.onSubmit(taxYear: Int, mode: Mode = NormalMode, propertyType: PropertyType = Rentals)
+GET         /:taxYear/rentals/adjustments/change-unused-residential-finance-cost                                controllers.adjustments.UnusedResidentialFinanceCostController.onPageLoad(taxYear: Int, mode: Mode = CheckMode, propertyType: PropertyType = Rentals)
+POST        /:taxYear/rentals/adjustments/change-unused-residential-finance-cost                                controllers.adjustments.UnusedResidentialFinanceCostController.onSubmit(taxYear: Int, mode: Mode = CheckMode, propertyType: PropertyType = Rentals)
 
 GET         /:taxYear/rentals/adjustments/check-your-answers                                                    controllers.adjustments.AdjustmentsCheckYourAnswersController.onPageLoad(taxYear : Int)
 POST        /:taxYear/rentals/adjustments/check-your-answers                                                    controllers.adjustments.AdjustmentsCheckYourAnswersController.onSubmit(taxYear : Int)
@@ -744,3 +744,8 @@ POST        /:taxYear/rentals-rent-a-room/adjustments/private-use-adjustment
 GET         /:taxYear/rentals-rent-a-room/adjustments/change-private-use-adjustment                                         controllers.adjustments.PrivateUseAdjustmentController.onPageLoad(taxYear: Int, mode: Mode = CheckMode, propertyType: PropertyType = RentalsRentARoom)
 POST        /:taxYear/rentals-rent-a-room/adjustments/change-private-use-adjustment                                         controllers.adjustments.PrivateUseAdjustmentController.onSubmit(taxYear: Int, mode: Mode = CheckMode, propertyType: PropertyType = RentalsRentARoom)
 
+GET         /:taxYear/rentals-rent-a-room/adjustments/unused-residential-finance-cost                                                controllers.adjustments.UnusedResidentialFinanceCostController.onPageLoad(taxYear: Int, mode: Mode = NormalMode, propertyType: PropertyType = RentalsRentARoom)
+POST        /:taxYear/rentals-rent-a-room/adjustments/unused-residential-finance-cost                                                controllers.adjustments.UnusedResidentialFinanceCostController.onSubmit(taxYear: Int, mode: Mode = NormalMode, propertyType: PropertyType = RentalsRentARoom)
+GET         /:taxYear/rentals-rent-a-room/adjustments/change-unused-residential-finance-cost                                         controllers.adjustments.UnusedResidentialFinanceCostController.onPageLoad(taxYear: Int, mode: Mode = CheckMode, propertyType: PropertyType = RentalsRentARoom)
+POST        /:taxYear/rentals-rent-a-room/adjustments/change-unused-residential-finance-cost                                         controllers.adjustments.UnusedResidentialFinanceCostController.onSubmit(taxYear: Int, mode: Mode = CheckMode, propertyType: PropertyType = RentalsRentARoom)
+
diff --git a/conf/messages.cy b/conf/messages.cy
index aa250843..43bc3bf3 100644
--- a/conf/messages.cy
+++ b/conf/messages.cy
@@ -382,7 +382,6 @@ balancingCharge.label	=	Nodwch y ffigur
 
 unusedResidentialFinanceCost.title	=	Costau ariannol preswyl sydd heb eu defnyddio a ddygwyd ymlaen
 unusedResidentialFinanceCost.heading	=	Costau ariannol preswyl sydd heb eu defnyddio a ddygwyd ymlaen
-unusedResidentialFinanceCost.details.content.text	=	Deall costau ariannol preswyl sydd heb eu defnyddio a ddygwyd ymlaen
 unusedResidentialFinanceCost.details.content.link.content	=	Gallwch ddwyn unrhyw falans o gostau ariannol preswyl sydd heb eu defnyddio o hyd ymlaen i flynyddoedd yn y dyfodol ar gyfer yr un eiddo wedi’i rentu.
 unusedResidentialFinanceCost.details.content.link.intro	=	Darllenwch ragor am
 unusedResidentialFinanceCost.details.content.link.text	=	ryddhad treth i landlordiaid preswyl, ar GOV.UK (yn agor tab newydd)
diff --git a/conf/messages.en b/conf/messages.en
index 9b56c6ff..3fce5308 100644
--- a/conf/messages.en
+++ b/conf/messages.en
@@ -503,7 +503,6 @@ balancingCharge.amount.error.outOfRange = Enter an amount between £{0} and £{1
 
 unusedResidentialFinanceCost.title = Unused residential costs brought forward
 unusedResidentialFinanceCost.heading = Unused residential costs brought forward
-unusedResidentialFinanceCost.details.content.text = Understanding residential financial costs carried forward
 unusedResidentialFinanceCost.details.content.link.content = You can bring forward any balance of residential finance costs which are still unused to future years of the same property rental.
 unusedResidentialFinanceCost.details.content.link.intro = Read more about
 unusedResidentialFinanceCost.details.content.link.text = tax relief for residential landlords at GOV.UK (opens in new tab)
diff --git a/test/controllers/adjustments/UnusedResidentialCostControllerSpec.scala b/test/controllers/adjustments/UnusedResidentialCostControllerSpec.scala
index 597b01f9..926df585 100644
--- a/test/controllers/adjustments/UnusedResidentialCostControllerSpec.scala
+++ b/test/controllers/adjustments/UnusedResidentialCostControllerSpec.scala
@@ -18,7 +18,7 @@ package controllers.adjustments
 
 import base.SpecBase
 import forms.adjustments.UnusedResidentialFinanceCostFormProvider
-import models.{NormalMode, UserAnswers}
+import models.{NormalMode, Rentals, RentalsRentARoom, UserAnswers}
 import navigation.{FakeNavigator, Navigator}
 import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito.when
@@ -44,7 +44,8 @@ class UnusedResidentialCostControllerSpec extends SpecBase with MockitoSugar {
 
   def onwardRoute: Call = Call("GET", "/unused-residential-finance-cost")
 
-  lazy val unusedResidentialFinanceCostRoute: String = routes.UnusedResidentialFinanceCostController.onPageLoad(taxYear, NormalMode).url
+  lazy val rentalsRoute: String = routes.UnusedResidentialFinanceCostController.onPageLoad(taxYear, NormalMode, Rentals).url
+  lazy val rentalsRentARoomRoute: String = routes.UnusedResidentialFinanceCostController.onPageLoad(taxYear, NormalMode, RentalsRentARoom).url
 
   "UnusedResidentialFinanceCost Controller" - {
 
@@ -53,32 +54,50 @@ class UnusedResidentialCostControllerSpec extends SpecBase with MockitoSugar {
       val application = applicationBuilder(userAnswers = Some(emptyUserAnswers), isAgent = false).build()
 
       running(application) {
-        val request = FakeRequest(GET, unusedResidentialFinanceCostRoute)
+        val request = FakeRequest(GET, rentalsRoute)
 
         val result = route(application, request).value
 
         val view = application.injector.instanceOf[UnusedResidentialFinanceCostView]
 
         status(result) mustEqual OK
-        contentAsString(result) mustEqual view(form, taxYear, NormalMode)(request, messages(application)).toString
+        contentAsString(result) mustEqual view(form, taxYear, NormalMode, Rentals)(request, messages(application)).toString
       }
     }
 
-    "must populate the view correctly on a GET when the question has previously been answered" in {
+    "Rentals only journey must populate the view correctly on a GET when the question has previously been answered" in {
 
-      val userAnswers = UserAnswers(userAnswersId).set(UnusedResidentialFinanceCostPage, validAnswer).success.value
+      val userAnswers = UserAnswers(userAnswersId).set(UnusedResidentialFinanceCostPage(Rentals), validAnswer).success.value
 
       val application = applicationBuilder(userAnswers = Some(userAnswers), isAgent = false).build()
 
       running(application) {
-        val request = FakeRequest(GET, unusedResidentialFinanceCostRoute)
+        val request = FakeRequest(GET, rentalsRoute)
 
         val view = application.injector.instanceOf[UnusedResidentialFinanceCostView]
 
         val result = route(application, request).value
 
         status(result) mustEqual OK
-        contentAsString(result) mustEqual view(form.fill(validAnswer), taxYear, NormalMode)(request, messages(application)).toString
+        contentAsString(result) mustEqual view(form.fill(validAnswer), taxYear, NormalMode, Rentals)(request, messages(application)).toString
+      }
+    }
+
+    "Rentals RaR journey must populate the view correctly on a GET when the question has previously been answered" in {
+
+      val userAnswers = UserAnswers(userAnswersId).set(UnusedResidentialFinanceCostPage(RentalsRentARoom), validAnswer).success.value
+
+      val application = applicationBuilder(userAnswers = Some(userAnswers), isAgent = false).build()
+
+      running(application) {
+        val request = FakeRequest(GET, rentalsRentARoomRoute)
+
+        val view = application.injector.instanceOf[UnusedResidentialFinanceCostView]
+
+        val result = route(application, request).value
+
+        status(result) mustEqual OK
+        contentAsString(result) mustEqual view(form.fill(validAnswer), taxYear, NormalMode, RentalsRentARoom)(request, messages(application)).toString
       }
     }
 
@@ -98,7 +117,7 @@ class UnusedResidentialCostControllerSpec extends SpecBase with MockitoSugar {
 
       running(application) {
         val request =
-          FakeRequest(POST, unusedResidentialFinanceCostRoute)
+          FakeRequest(POST, rentalsRoute)
             .withFormUrlEncodedBody(("unusedResidentialFinanceCost", validAnswer.toString))
 
         val result = route(application, request).value
@@ -114,7 +133,7 @@ class UnusedResidentialCostControllerSpec extends SpecBase with MockitoSugar {
 
       running(application) {
         val request =
-          FakeRequest(POST, unusedResidentialFinanceCostRoute)
+          FakeRequest(POST, rentalsRoute)
             .withFormUrlEncodedBody(("value", "invalid value"))
 
         val boundForm = form.bind(Map("value" -> "invalid value"))
@@ -124,7 +143,7 @@ class UnusedResidentialCostControllerSpec extends SpecBase with MockitoSugar {
         val result = route(application, request).value
 
         status(result) mustEqual BAD_REQUEST
-        contentAsString(result) mustEqual view(boundForm, taxYear, NormalMode)(request, messages(application)).toString
+        contentAsString(result) mustEqual view(boundForm, taxYear, NormalMode, Rentals)(request, messages(application)).toString
       }
     }
 
@@ -133,7 +152,7 @@ class UnusedResidentialCostControllerSpec extends SpecBase with MockitoSugar {
       val application = applicationBuilder(userAnswers = None, isAgent = true).build()
 
       running(application) {
-        val request = FakeRequest(GET, unusedResidentialFinanceCostRoute)
+        val request = FakeRequest(GET, rentalsRoute)
 
         val result = route(application, request).value
 
@@ -147,7 +166,7 @@ class UnusedResidentialCostControllerSpec extends SpecBase with MockitoSugar {
 
       running(application) {
         val request =
-          FakeRequest(POST, unusedResidentialFinanceCostRoute)
+          FakeRequest(POST, rentalsRoute)
             .withFormUrlEncodedBody(("value", validAnswer.toString))
 
         val result = route(application, request).value
diff --git a/test/controllers/session/PropertyPeriodSessionRecoveryExtensionsSpec.scala b/test/controllers/session/PropertyPeriodSessionRecoveryExtensionsSpec.scala
index 445c83f0..5a5ba605 100644
--- a/test/controllers/session/PropertyPeriodSessionRecoveryExtensionsSpec.scala
+++ b/test/controllers/session/PropertyPeriodSessionRecoveryExtensionsSpec.scala
@@ -220,7 +220,7 @@ class PropertyPeriodSessionRecoveryExtensionsSpec extends SpecBase with MockitoS
         Some(23)
       )
       updated.get(ResidentialFinanceCostPage(Rentals)).get mustBe 2
-      updated.get(UnusedResidentialFinanceCostPage).get mustBe 3
+      updated.get(UnusedResidentialFinanceCostPage(Rentals)).get mustBe 3
       updated.get(ClaimEsbaPage(Rentals)).get mustBe true
       updated.get(EsbaAddressPage(0)).get mustBe EsbaAddress(
         "12",
diff --git a/test/navigation/NavigatorSpec.scala b/test/navigation/NavigatorSpec.scala
index 38609926..b232278d 100644
--- a/test/navigation/NavigatorSpec.scala
+++ b/test/navigation/NavigatorSpec.scala
@@ -624,12 +624,12 @@ class NavigatorSpec extends SpecBase {
           NormalMode,
           UserAnswers("test"),
           UserAnswers("test")
-        ) mustBe UnusedResidentialFinanceCostController.onPageLoad(taxYear, NormalMode)
+        ) mustBe UnusedResidentialFinanceCostController.onPageLoad(taxYear, NormalMode, Rentals)
       }
 
       "must go from UnusedResidentialFinanceCostPage to AdjustmentsCheckYourAnswersPage" in {
         navigator.nextPage(
-          UnusedResidentialFinanceCostPage,
+          UnusedResidentialFinanceCostPage(Rentals),
           taxYear,
           NormalMode,
           UserAnswers("test"),
@@ -1416,7 +1416,7 @@ class NavigatorSpec extends SpecBase {
 
       "must go from UnusedResidentialFinanceCostPage to AdjustmentsCheckYourAnswersPage" in {
         navigator.nextPage(
-          UnusedResidentialFinanceCostPage,
+          UnusedResidentialFinanceCostPage(Rentals),
           taxYear,
           CheckMode,
           UserAnswers("test"),