Repository: PolicyEngine/policyengine-uk (language: python)

Issue:
Make parameter currency metadata consistent
It's currently `currency` in some places and `currency-GBP` in others


Discussion / hints:
Per @eraviart, `currency-GBP` would be most consistent with other models

Fix patch:
diff --git a/docs/summary/generate_descriptions.py b/docs/summary/generate_descriptions.py
index 2ae475dec..a69f5924a 100644
--- a/docs/summary/generate_descriptions.py
+++ b/docs/summary/generate_descriptions.py
@@ -1,5 +1,4 @@
 from openfisca_uk import Microsimulation
-import numpy as np
 from tqdm import tqdm
 
 sim = Microsimulation()
diff --git a/openfisca_uk/graphs/data.py b/openfisca_uk/graphs/data.py
index 18257e02c..1961e6c6b 100644
--- a/openfisca_uk/graphs/data.py
+++ b/openfisca_uk/graphs/data.py
@@ -2,7 +2,6 @@
 from openfisca_uk.api import *
 from openfisca_uk.situation_examples.examples import single_person_UC
 import pandas as pd
-from microdf import MicroDataFrame
 
 
 def get_wide_reform_population_data(
diff --git a/openfisca_uk/graphs/population.py b/openfisca_uk/graphs/population.py
index 77358b8f0..d824e5f49 100644
--- a/openfisca_uk/graphs/population.py
+++ b/openfisca_uk/graphs/population.py
@@ -1,4 +1,4 @@
-from typing import List, Union
+from typing import List
 import plotly.express as px
 from openfisca_uk.api import *
 import pandas as pd
diff --git a/openfisca_uk/parameters/benefit/ESA/income/amount_18_24.yaml b/openfisca_uk/parameters/benefit/ESA/income/amount_18_24.yaml
index 01de90a48..111558c23 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/amount_18_24.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/amount_18_24.yaml
@@ -6,5 +6,5 @@ values:
     value: 58.90
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=38
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/ESA/income/amount_over_25.yaml b/openfisca_uk/parameters/benefit/ESA/income/amount_over_25.yaml
index 3b7a763c8..d8571e54a 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/amount_over_25.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/amount_over_25.yaml
@@ -6,5 +6,5 @@ values:
     value: 74.35
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=38
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/ESA/income/couple.yaml b/openfisca_uk/parameters/benefit/ESA/income/couple.yaml
index 706f3d7f3..4afdfb096 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/couple.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/couple.yaml
@@ -6,5 +6,5 @@ values:
     value: 116.80
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=38
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/ESA/income/earn_disregard.yaml b/openfisca_uk/parameters/benefit/ESA/income/earn_disregard.yaml
index ff7cc4606..3ae488125 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/earn_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=38
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_couple.yaml
index 283091f1c..96f023796 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 10.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=38
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_lone_parent.yaml
index 176c3848e..a2a3b6f5b 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_lone_parent.yaml
@@ -4,5 +4,5 @@ values:
     value: 20.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=38
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_single.yaml
index 669e66e60..c97dbad53 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/income_disregard_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=38
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/ESA/income/pension_disregard.yaml b/openfisca_uk/parameters/benefit/ESA/income/pension_disregard.yaml
index 811238b3e..72482e0ed 100644
--- a/openfisca_uk/parameters/benefit/ESA/income/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/ESA/income/pension_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 50.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=38
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/IIDB/maximum.yaml b/openfisca_uk/parameters/benefit/IIDB/maximum.yaml
index be546b5a3..2ac727300 100644
--- a/openfisca_uk/parameters/benefit/IIDB/maximum.yaml
+++ b/openfisca_uk/parameters/benefit/IIDB/maximum.yaml
@@ -4,5 +4,5 @@ values:
     value: 182
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/industrial-injuries-disablement-benefit/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/JSA/contrib/amount_18_24.yaml b/openfisca_uk/parameters/benefit/JSA/contrib/amount_18_24.yaml
index 849b04809..5323f6739 100644
--- a/openfisca_uk/parameters/benefit/JSA/contrib/amount_18_24.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/contrib/amount_18_24.yaml
@@ -6,5 +6,5 @@ values:
     value: 59.07
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/contrib/amount_over_25.yaml b/openfisca_uk/parameters/benefit/JSA/contrib/amount_over_25.yaml
index 50b2ebae8..e9b13c747 100644
--- a/openfisca_uk/parameters/benefit/JSA/contrib/amount_over_25.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/contrib/amount_over_25.yaml
@@ -6,5 +6,5 @@ values:
     value: 74.58
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/contrib/earn_disregard.yaml b/openfisca_uk/parameters/benefit/JSA/contrib/earn_disregard.yaml
index 3c243c502..b4b6f23b9 100644
--- a/openfisca_uk/parameters/benefit/JSA/contrib/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/contrib/earn_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/contrib/pension_disregard.yaml b/openfisca_uk/parameters/benefit/JSA/contrib/pension_disregard.yaml
index 3889c4e78..7dca91b8c 100644
--- a/openfisca_uk/parameters/benefit/JSA/contrib/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/contrib/pension_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 50.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/income/amount_18_24.yaml b/openfisca_uk/parameters/benefit/JSA/income/amount_18_24.yaml
index 47499e549..951d340a1 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/amount_18_24.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/amount_18_24.yaml
@@ -6,5 +6,5 @@ values:
     value: 59.07
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/income/amount_over_25.yaml b/openfisca_uk/parameters/benefit/JSA/income/amount_over_25.yaml
index 903bc8c87..e1c495873 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/amount_over_25.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/amount_over_25.yaml
@@ -6,5 +6,5 @@ values:
     value: 74.58
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/income/couple.yaml b/openfisca_uk/parameters/benefit/JSA/income/couple.yaml
index e8373c94b..1183cfc26 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/couple.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/couple.yaml
@@ -6,5 +6,5 @@ values:
     value: 116.80
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_couple.yaml
index 8b532b4f5..6ecd157aa 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 10.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_lone_parent.yaml
index 3ba38460f..28a8496a8 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_lone_parent.yaml
@@ -4,5 +4,5 @@ values:
     value: 20.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_single.yaml
index 5f8f8c4ca..5770756fd 100644
--- a/openfisca_uk/parameters/benefit/JSA/income/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/JSA/income/income_disregard_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_1.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_1.yaml
index fead359d2..a67cff95b 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_1.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_1.yaml
@@ -4,5 +4,5 @@ values:
     value: 123.57
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: http://www.oecd.org/els/soc/TaxBEN-United-Kingdom-2018.pdf
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_2.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_2.yaml
index 40422a7c8..03c34d8c9 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_2.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_2.yaml
@@ -4,5 +4,5 @@ values:
     value: 157.56
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: http://www.oecd.org/els/soc/TaxBEN-United-Kingdom-2018.pdf
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_3.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_3.yaml
index 3c57a003c..b0482fac1 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_3.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_3.yaml
@@ -4,5 +4,5 @@ values:
     value: 180.45
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: http://www.oecd.org/els/soc/TaxBEN-United-Kingdom-2018.pdf
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_4.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_4.yaml
index 69725d359..7283f98c6 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_4.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/beds_4.yaml
@@ -4,5 +4,5 @@ values:
     value: 235.41
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: http://www.oecd.org/els/soc/TaxBEN-United-Kingdom-2018.pdf
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/rate_caps/shared.yaml b/openfisca_uk/parameters/benefit/LHA/rate_caps/shared.yaml
index 3462634e9..dd6da3313 100644
--- a/openfisca_uk/parameters/benefit/LHA/rate_caps/shared.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/rate_caps/shared.yaml
@@ -4,5 +4,5 @@ values:
     value: 68.28
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: http://www.oecd.org/els/soc/TaxBEN-United-Kingdom-2018.pdf
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/attendance_allowance/lower.yaml b/openfisca_uk/parameters/benefit/attendance_allowance/lower.yaml
index 14d4e7fb3..ce8f5c6fd 100644
--- a/openfisca_uk/parameters/benefit/attendance_allowance/lower.yaml
+++ b/openfisca_uk/parameters/benefit/attendance_allowance/lower.yaml
@@ -4,5 +4,5 @@ values:
     value: 59.70
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/attendance-allowance/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/attendance_allowance/upper.yaml b/openfisca_uk/parameters/benefit/attendance_allowance/upper.yaml
index 04e836680..cf6bdc38f 100644
--- a/openfisca_uk/parameters/benefit/attendance_allowance/upper.yaml
+++ b/openfisca_uk/parameters/benefit/attendance_allowance/upper.yaml
@@ -4,5 +4,5 @@ values:
     value: 89.15
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/attendance-allowance/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/benefit_cap/has_children.yaml b/openfisca_uk/parameters/benefit/benefit_cap/has_children.yaml
index b630da3f1..d27f78498 100644
--- a/openfisca_uk/parameters/benefit/benefit_cap/has_children.yaml
+++ b/openfisca_uk/parameters/benefit/benefit_cap/has_children.yaml
@@ -4,5 +4,5 @@ values:
     value: 384.62
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/benefit-cap/benefit-cap-amounts
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/benefit_cap/london_children.yaml b/openfisca_uk/parameters/benefit/benefit_cap/london_children.yaml
index d70050833..0700aa798 100644
--- a/openfisca_uk/parameters/benefit/benefit_cap/london_children.yaml
+++ b/openfisca_uk/parameters/benefit/benefit_cap/london_children.yaml
@@ -4,5 +4,5 @@ values:
     value: 442.31
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/benefit-cap/benefit-cap-amounts
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/benefit_cap/london_no_children.yaml b/openfisca_uk/parameters/benefit/benefit_cap/london_no_children.yaml
index d1537fff2..7a47dca5c 100644
--- a/openfisca_uk/parameters/benefit/benefit_cap/london_no_children.yaml
+++ b/openfisca_uk/parameters/benefit/benefit_cap/london_no_children.yaml
@@ -4,5 +4,5 @@ values:
     value: 296.35
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/benefit-cap/benefit-cap-amounts
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/benefit_cap/no_children.yaml b/openfisca_uk/parameters/benefit/benefit_cap/no_children.yaml
index cc1d43f97..268795588 100644
--- a/openfisca_uk/parameters/benefit/benefit_cap/no_children.yaml
+++ b/openfisca_uk/parameters/benefit/benefit_cap/no_children.yaml
@@ -4,5 +4,5 @@ values:
     value: 257.69
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/benefit-cap/benefit-cap-amounts
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/carer_premium/couple.yaml b/openfisca_uk/parameters/benefit/carer_premium/couple.yaml
index b94e79dc0..d7a1e632f 100644
--- a/openfisca_uk/parameters/benefit/carer_premium/couple.yaml
+++ b/openfisca_uk/parameters/benefit/carer_premium/couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 37.50
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.mariecurie.org.uk/help/support/benefits-entitlements/carers/premium
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/carer_premium/single.yaml b/openfisca_uk/parameters/benefit/carer_premium/single.yaml
index 0d6319a7c..003a02171 100644
--- a/openfisca_uk/parameters/benefit/carer_premium/single.yaml
+++ b/openfisca_uk/parameters/benefit/carer_premium/single.yaml
@@ -4,5 +4,5 @@ values:
     value: 37.50
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.mariecurie.org.uk/help/support/benefits-entitlements/carers/premium
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/carers_allowance/amount.yaml b/openfisca_uk/parameters/benefit/carers_allowance/amount.yaml
index d4993e476..e4a2e5ff2 100644
--- a/openfisca_uk/parameters/benefit/carers_allowance/amount.yaml
+++ b/openfisca_uk/parameters/benefit/carers_allowance/amount.yaml
@@ -4,5 +4,5 @@ values:
     value: 67.25
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/carers-allowance
diff --git a/openfisca_uk/parameters/benefit/child_benefit/amount/additional.yaml b/openfisca_uk/parameters/benefit/child_benefit/amount/additional.yaml
index 4856f36a5..b3215167e 100644
--- a/openfisca_uk/parameters/benefit/child_benefit/amount/additional.yaml
+++ b/openfisca_uk/parameters/benefit/child_benefit/amount/additional.yaml
@@ -25,7 +25,7 @@ values:
     value: 14.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://revenuebenefits.org.uk/child-benefit/guidance/how-much-can-your-client-get/rates-and-tables/
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/child_benefit/amount/eldest.yaml b/openfisca_uk/parameters/benefit/child_benefit/amount/eldest.yaml
index a1880b868..8ffa82a99 100644
--- a/openfisca_uk/parameters/benefit/child_benefit/amount/eldest.yaml
+++ b/openfisca_uk/parameters/benefit/child_benefit/amount/eldest.yaml
@@ -1,4 +1,4 @@
-description: Child benefit amount for additional children
+description: Child benefit amount for the eldest or only child
 values:
   2004-04-06:
     value: 16.50
@@ -25,7 +25,7 @@ values:
     value: 21.15
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://revenuebenefits.org.uk/child-benefit/guidance/how-much-can-your-client-get/rates-and-tables/
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/constant_attendance_allowance/exceptional_rate.yaml b/openfisca_uk/parameters/benefit/constant_attendance_allowance/exceptional_rate.yaml
index 6eab539fa..58054ba25 100644
--- a/openfisca_uk/parameters/benefit/constant_attendance_allowance/exceptional_rate.yaml
+++ b/openfisca_uk/parameters/benefit/constant_attendance_allowance/exceptional_rate.yaml
@@ -4,5 +4,5 @@ values:
     value: 145.60
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/constant-attendance-allowance/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/constant_attendance_allowance/full_day_rate.yaml b/openfisca_uk/parameters/benefit/constant_attendance_allowance/full_day_rate.yaml
index bc9c1ede3..98b188054 100644
--- a/openfisca_uk/parameters/benefit/constant_attendance_allowance/full_day_rate.yaml
+++ b/openfisca_uk/parameters/benefit/constant_attendance_allowance/full_day_rate.yaml
@@ -4,5 +4,5 @@ values:
     value: 72.80
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/constant-attendance-allowance/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/constant_attendance_allowance/intermediate_rate.yaml b/openfisca_uk/parameters/benefit/constant_attendance_allowance/intermediate_rate.yaml
index bbe6a272a..380c38ee6 100644
--- a/openfisca_uk/parameters/benefit/constant_attendance_allowance/intermediate_rate.yaml
+++ b/openfisca_uk/parameters/benefit/constant_attendance_allowance/intermediate_rate.yaml
@@ -4,5 +4,5 @@ values:
     value: 109.20
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/constant-attendance-allowance/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/constant_attendance_allowance/part_day_rate.yaml b/openfisca_uk/parameters/benefit/constant_attendance_allowance/part_day_rate.yaml
index 7cd6ba54b..9fa84ea6a 100644
--- a/openfisca_uk/parameters/benefit/constant_attendance_allowance/part_day_rate.yaml
+++ b/openfisca_uk/parameters/benefit/constant_attendance_allowance/part_day_rate.yaml
@@ -4,5 +4,5 @@ values:
     value: 36.40
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/constant-attendance-allowance/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/disability_premia/disability_couple.yaml b/openfisca_uk/parameters/benefit/disability_premia/disability_couple.yaml
index 2d645ad81..d0efb00e3 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/disability_couple.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/disability_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 49.80
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/disability-premiums/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/disability_premia/disability_single.yaml b/openfisca_uk/parameters/benefit/disability_premia/disability_single.yaml
index 6b8551745..8e66e5fbf 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/disability_single.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/disability_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 34.95
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/disability-premiums/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/disability_premia/enhanced_couple.yaml b/openfisca_uk/parameters/benefit/disability_premia/enhanced_couple.yaml
index 38c02c17f..1fbc11ce7 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/enhanced_couple.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/enhanced_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 24.50
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/disability-premiums/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/disability_premia/enhanced_single.yaml b/openfisca_uk/parameters/benefit/disability_premia/enhanced_single.yaml
index 86fe69682..687959962 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/enhanced_single.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/enhanced_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 17.10
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/disability-premiums/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/disability_premia/severe_couple.yaml b/openfisca_uk/parameters/benefit/disability_premia/severe_couple.yaml
index cb86ecacd..8f666d7c5 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/severe_couple.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/severe_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 133.90
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/disability-premiums/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/disability_premia/severe_single.yaml b/openfisca_uk/parameters/benefit/disability_premia/severe_single.yaml
index e3a9a4427..98b728e7b 100644
--- a/openfisca_uk/parameters/benefit/disability_premia/severe_single.yaml
+++ b/openfisca_uk/parameters/benefit/disability_premia/severe_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 66.95
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/disability-premiums/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/child.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/child.yaml
index 9a8a47739..74fa5febd 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/child.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/child.yaml
@@ -4,5 +4,5 @@ values:
     value: 66.90
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/SP_age.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/SP_age.yaml
index 3bd82486e..9410bde16 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/SP_age.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/SP_age.yaml
@@ -4,5 +4,5 @@ values:
     value: 270.60
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/both_under_18.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/both_under_18.yaml
index 70cfe8738..8ab829810 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/both_under_18.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/both_under_18.yaml
@@ -4,5 +4,5 @@ values:
     value: 87.50
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/over_18.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/over_18.yaml
index eb9e9400e..b2d19428b 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/over_18.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/couple/over_18.yaml
@@ -4,5 +4,5 @@ values:
     value: 114.85
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/SP_age.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/SP_age.yaml
index 341beca17..fecebcead 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/SP_age.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/SP_age.yaml
@@ -4,5 +4,5 @@ values:
     value: 181
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/over_18.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/over_18.yaml
index 0175128d3..67a30d929 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/over_18.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/over_18.yaml
@@ -4,5 +4,5 @@ values:
     value: 73.10
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/under_18.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/under_18.yaml
index 12de9897a..c3e8a6b34 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/under_18.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/lone_parent/under_18.yaml
@@ -4,5 +4,5 @@ values:
     value: 57.90
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/SP_age.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/SP_age.yaml
index 13b7bbc01..5bc9826c3 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/SP_age.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/SP_age.yaml
@@ -4,5 +4,5 @@ values:
     value: 181.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/over_25.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/over_25.yaml
index 19356a27f..b2698d123 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/over_25.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/over_25.yaml
@@ -4,5 +4,5 @@ values:
     value: 73.10
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/under_25.yaml b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/under_25.yaml
index dbe3e2651..a470a4897 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/under_25.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/allowances/single/under_25.yaml
@@ -4,5 +4,5 @@ values:
     value: 57.90
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/premiums/disabled_child.yaml b/openfisca_uk/parameters/benefit/housing_benefit/premiums/disabled_child.yaml
index c7cc6b0a7..28c9d3445 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/premiums/disabled_child.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/premiums/disabled_child.yaml
@@ -4,5 +4,5 @@ values:
     value: 64.19
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_couple.yaml b/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_couple.yaml
index c2d2520f5..c67b588fe 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_couple.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 17.45
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_lone.yaml b/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_lone.yaml
index f0038696f..7b3605916 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_lone.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/premiums/family_lone.yaml
@@ -4,5 +4,5 @@ values:
     value: 22.20
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://england.shelter.org.uk/legal/benefits/housing_benefit/benefit_rates/housing_benefit_calculation_rates_2019_to_2020
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_16_24.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_16_24.yaml
index 739d1bd19..ff7835b13 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_16_24.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_16_24.yaml
@@ -4,5 +4,5 @@ values:
     value: 58.90
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_16_17.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_16_17.yaml
index 7f0544403..a50b11a65 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_16_17.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_16_17.yaml
@@ -4,5 +4,5 @@ values:
     value: 58.90
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_age_gap.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_age_gap.yaml
index eae688bb6..793893779 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_age_gap.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_age_gap.yaml
@@ -4,5 +4,5 @@ values:
     value: 74.35
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_over_18.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_over_18.yaml
index 5c1163706..a7f5ea01b 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_over_18.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_couples_over_18.yaml
@@ -4,5 +4,5 @@ values:
     value: 116.80
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_16_17.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_16_17.yaml
index 5451923e6..f09698758 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_16_17.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_16_17.yaml
@@ -4,5 +4,5 @@ values:
     value: 58.90
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_over_18.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_over_18.yaml
index 8a4707f77..c19cfdfa2 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_over_18.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_lone_over_18.yaml
@@ -4,5 +4,5 @@ values:
     value: 74.35
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/amounts/amount_over_25.yaml b/openfisca_uk/parameters/benefit/income_support/amounts/amount_over_25.yaml
index 735d4171d..49f3522df 100644
--- a/openfisca_uk/parameters/benefit/income_support/amounts/amount_over_25.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/amounts/amount_over_25.yaml
@@ -4,5 +4,5 @@ values:
     value: 74.35
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/income-support/what-youll-get
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/pension_credit/min_guarantee/couple.yaml b/openfisca_uk/parameters/benefit/pension_credit/min_guarantee/couple.yaml
index 6e5bda288..82575eb32 100644
--- a/openfisca_uk/parameters/benefit/pension_credit/min_guarantee/couple.yaml
+++ b/openfisca_uk/parameters/benefit/pension_credit/min_guarantee/couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 265.20
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=36
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/pension_credit/min_guarantee/single.yaml b/openfisca_uk/parameters/benefit/pension_credit/min_guarantee/single.yaml
index 72db46da7..6abf39e72 100644
--- a/openfisca_uk/parameters/benefit/pension_credit/min_guarantee/single.yaml
+++ b/openfisca_uk/parameters/benefit/pension_credit/min_guarantee/single.yaml
@@ -4,5 +4,5 @@ values:
     value: 173.75
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=36
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/couple_threshold.yaml b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/couple_threshold.yaml
index 303117758..5204dade7 100644
--- a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/couple_threshold.yaml
+++ b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/couple_threshold.yaml
@@ -4,5 +4,5 @@ values:
     value: 235.62
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=37
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/max_couple.yaml b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/max_couple.yaml
index e9dba0ede..a09f53a5a 100644
--- a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/max_couple.yaml
+++ b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/max_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 15.62
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=37
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/max_single.yaml b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/max_single.yaml
index b5597fa1a..d5ad1ad4a 100644
--- a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/max_single.yaml
+++ b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/max_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 13.97
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=37
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/single_threshold.yaml b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/single_threshold.yaml
index adfc3a822..804926df5 100644
--- a/openfisca_uk/parameters/benefit/pension_credit/savings_credit/single_threshold.yaml
+++ b/openfisca_uk/parameters/benefit/pension_credit/savings_credit/single_threshold.yaml
@@ -12,5 +12,5 @@ values:
     value: 148.17
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=37
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/child_element.yaml b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/child_element.yaml
index c8f1c6143..fd22052a9 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/child_element.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/child_element.yaml
@@ -9,7 +9,7 @@ values:
     value: 2845
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
   - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=27
diff --git a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/dis_child_element.yaml b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/dis_child_element.yaml
index f11303dc7..3336cf9b5 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/dis_child_element.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/dis_child_element.yaml
@@ -15,7 +15,7 @@ values:
     value: 3435
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
     - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance,
     - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
diff --git a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/family_element.yaml b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/family_element.yaml
index 31caaf999..5442ef656 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/family_element.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/family_element.yaml
@@ -4,7 +4,7 @@ values:
     value: 545
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
   - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=27
diff --git a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/severe_dis_child_element.yaml b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/severe_dis_child_element.yaml
index edb3496c9..1f36ec271 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/severe_dis_child_element.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/child_tax_credit/elements/severe_dis_child_element.yaml
@@ -15,7 +15,7 @@ values:
     value: 1390
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance,
   - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/basic.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/basic.yaml
index f600c714c..ea42a4a70 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/basic.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/basic.yaml
@@ -9,7 +9,7 @@ values:
     value: 2005
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/working-tax-credit/what-youll-get
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_1.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_1.yaml
index 587ee5f99..0f63d21d3 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_1.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_1.yaml
@@ -4,7 +4,7 @@ values:
     value: 122.50  # 175 * 70%
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
   - https://www.gov.uk/working-tax-credit/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_2.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_2.yaml
index f6e1bedfb..af9faa802 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_2.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/childcare_2.yaml
@@ -4,7 +4,7 @@ values:
     value: 210  # 300 * 70%
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
   - https://www.gov.uk/working-tax-credit/what-youll-get
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/couple.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/couple.yaml
index a38eb16c7..8775adbd1 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/couple.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/couple.yaml
@@ -9,7 +9,7 @@ values:
     value: 2060
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/working-tax-credit/what-youll-get
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/disabled.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/disabled.yaml
index 57fe07f58..7a4310094 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/disabled.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/disabled.yaml
@@ -15,7 +15,7 @@ values:
     value: 3240
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/working-tax-credit/what-youll-get
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/lone_parent.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/lone_parent.yaml
index 7de69628d..9b7855bb8 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/lone_parent.yaml
@@ -9,7 +9,7 @@ values:
     value: 2060
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/working-tax-credit/what-youll-get
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/severely_disabled.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/severely_disabled.yaml
index 66d42daaf..2bc9e3c45 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/severely_disabled.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/severely_disabled.yaml
@@ -15,7 +15,7 @@ values:
     value: 1400
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/working-tax-credit/what-youll-get
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/worker.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/worker.yaml
index 15461f42a..434976acd 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/worker.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/elements/worker.yaml
@@ -9,7 +9,7 @@ values:
     value: 830
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.gov.uk/working-tax-credit/what-youll-get
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/couple_with_children.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/couple_with_children.yaml
index 174604f37..fa403e243 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/couple_with_children.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/couple_with_children.yaml
@@ -4,5 +4,5 @@ values:
     value: 24
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/working-tax-credit
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/default.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/default.yaml
index 431f56116..f23ab1fd7 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/default.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/default.yaml
@@ -4,5 +4,5 @@ values:
     value: 30
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/working-tax-credit
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/lower.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/lower.yaml
index 7d2e53d28..91f0833e7 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/lower.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/lower.yaml
@@ -4,5 +4,5 @@ values:
     value: 16
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/working-tax-credit
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/old_age.yaml b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/old_age.yaml
index dfec8b339..37f5c4dcd 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/old_age.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/working_tax_credit/min_hours/old_age.yaml
@@ -4,5 +4,5 @@ values:
     value: 60
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/working-tax-credit
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/carer/amount.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/carer/amount.yaml
index 1782e4574..1bfbef49c 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/carer/amount.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/carer/amount.yaml
@@ -7,5 +7,5 @@ values:
   2020-06-01: 163.73  # gov.uk/entitledto
 metadata:
   period: month
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=46
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/child/amount.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/child/amount.yaml
index 1dcbf5207..6dc62654b 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/child/amount.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/child/amount.yaml
@@ -4,5 +4,5 @@ values:
   2020-06-21: 237.08
 metadata:
   period: month
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=45
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/child/disabled/amount.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/child/disabled/amount.yaml
index 827ae4464..05a7bea95 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/child/disabled/amount.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/child/disabled/amount.yaml
@@ -4,5 +4,5 @@ values:
   2020-06-01: 128.67
 metadata:
   period: month
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=46
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/child/severely_disabled/amount.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/child/severely_disabled/amount.yaml
index b6d673d18..a29eab4d8 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/child/severely_disabled/amount.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/child/severely_disabled/amount.yaml
@@ -7,5 +7,5 @@ values:
   2020-06-01: 271.36
 metadata:
   period: month
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=46
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/universal_credit/elements/disabled/amount.yaml b/openfisca_uk/parameters/benefit/universal_credit/elements/disabled/amount.yaml
index e64d0c194..e304e92b7 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/elements/disabled/amount.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/elements/disabled/amount.yaml
@@ -4,5 +4,5 @@ values:
   2020-06-01: 128.67
 metadata:
   period: month
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=46
\ No newline at end of file
diff --git a/openfisca_uk/parameters/law/minimum_wage/apprentice.yaml b/openfisca_uk/parameters/law/minimum_wage/apprentice.yaml
index 2df03b518..8dd29cdcc 100644
--- a/openfisca_uk/parameters/law/minimum_wage/apprentice.yaml
+++ b/openfisca_uk/parameters/law/minimum_wage/apprentice.yaml
@@ -4,5 +4,5 @@ values:
     value: 4.15
 metadata:
   period: hour
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/national-minimum-wage-rates
\ No newline at end of file
diff --git a/openfisca_uk/parameters/law/minimum_wage/between_18_20.yaml b/openfisca_uk/parameters/law/minimum_wage/between_18_20.yaml
index dd9d40dde..faeeb1643 100644
--- a/openfisca_uk/parameters/law/minimum_wage/between_18_20.yaml
+++ b/openfisca_uk/parameters/law/minimum_wage/between_18_20.yaml
@@ -4,5 +4,5 @@ values:
     value: 4.55
 metadata:
   period: hour
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/national-minimum-wage-rates
\ No newline at end of file
diff --git a/openfisca_uk/parameters/law/minimum_wage/between_21_24.yaml b/openfisca_uk/parameters/law/minimum_wage/between_21_24.yaml
index ab842eba8..739214d1e 100644
--- a/openfisca_uk/parameters/law/minimum_wage/between_21_24.yaml
+++ b/openfisca_uk/parameters/law/minimum_wage/between_21_24.yaml
@@ -4,5 +4,5 @@ values:
     value: 8.20
 metadata:
   period: hour
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/national-minimum-wage-rates
\ No newline at end of file
diff --git a/openfisca_uk/parameters/law/minimum_wage/over_25.yaml b/openfisca_uk/parameters/law/minimum_wage/over_25.yaml
index 6fa18b497..8d137b888 100644
--- a/openfisca_uk/parameters/law/minimum_wage/over_25.yaml
+++ b/openfisca_uk/parameters/law/minimum_wage/over_25.yaml
@@ -4,5 +4,5 @@ values:
     value: 8.72
 metadata:
   period: hour
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/national-minimum-wage-rates
\ No newline at end of file
diff --git a/openfisca_uk/parameters/law/minimum_wage/under_18.yaml b/openfisca_uk/parameters/law/minimum_wage/under_18.yaml
index 6e2297116..18c48f74a 100644
--- a/openfisca_uk/parameters/law/minimum_wage/under_18.yaml
+++ b/openfisca_uk/parameters/law/minimum_wage/under_18.yaml
@@ -4,5 +4,5 @@ values:
     value: 8.20
 metadata:
   period: hour
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/national-minimum-wage-rates
\ No newline at end of file
diff --git a/openfisca_uk/parameters/poverty/absolute_poverty_threshold_ahc.yaml b/openfisca_uk/parameters/poverty/absolute_poverty_threshold_ahc.yaml
index f9cada904..24940b089 100644
--- a/openfisca_uk/parameters/poverty/absolute_poverty_threshold_ahc.yaml
+++ b/openfisca_uk/parameters/poverty/absolute_poverty_threshold_ahc.yaml
@@ -4,5 +4,5 @@ values:
     value: 270
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.ifs.org.uk/comms/comm118.pdf#page=7
\ No newline at end of file
diff --git a/openfisca_uk/parameters/poverty/absolute_poverty_threshold_bhc.yaml b/openfisca_uk/parameters/poverty/absolute_poverty_threshold_bhc.yaml
index c3527a3c5..664525a94 100644
--- a/openfisca_uk/parameters/poverty/absolute_poverty_threshold_bhc.yaml
+++ b/openfisca_uk/parameters/poverty/absolute_poverty_threshold_bhc.yaml
@@ -4,5 +4,5 @@ values:
     value: 316
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.ifs.org.uk/comms/comm118.pdf#page=7
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/dividend_allowance.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/dividend_allowance.yaml
index 35bedeaa6..727476d67 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/dividend_allowance.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/dividend_allowance.yaml
@@ -4,5 +4,5 @@ values:
     value: 2000
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/government/publications/rates-and-allowances-income-tax/income-tax-rates-and-allowances-current-and-past
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/amount.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/amount.yaml
index 5d87661f3..d5654ad04 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/amount.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_allowance/amount.yaml
@@ -15,5 +15,5 @@ values:
     value: 12570
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.legislation.gov.uk/ukpga/2007/3/part/3/chapter/2/crossheading/personal-allowances
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/additional.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/additional.yaml
index 7e232b5d7..4a586204d 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/additional.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/additional.yaml
@@ -4,5 +4,5 @@ values:
     value: 0
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/apply-tax-free-interest-on-savings
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/basic.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/basic.yaml
index 5c249f28d..1e168bce1 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/basic.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/basic.yaml
@@ -4,5 +4,5 @@ values:
     value: 1000
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/apply-tax-free-interest-on-savings
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/higher.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/higher.yaml
index e0ef9aa0c..304fb79b9 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/higher.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/personal_savings_allowance/higher.yaml
@@ -4,5 +4,5 @@ values:
     value: 500
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/apply-tax-free-interest-on-savings
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/property_allowance.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/property_allowance.yaml
index 66a03e6f0..fb27b20ef 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/property_allowance.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/property_allowance.yaml
@@ -4,5 +4,5 @@ values:
     value: 1000
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/government/publications/rates-and-allowances-income-tax/income-tax-rates-and-allowances-current-and-past
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/allowances/trading_allowance.yaml b/openfisca_uk/parameters/tax/income_tax/allowances/trading_allowance.yaml
index 10f19f88a..164c5b6da 100644
--- a/openfisca_uk/parameters/tax/income_tax/allowances/trading_allowance.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/allowances/trading_allowance.yaml
@@ -4,5 +4,5 @@ values:
     value: 1000
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/government/publications/rates-and-allowances-income-tax/income-tax-rates-and-allowances-current-and-past
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_end.yaml b/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_end.yaml
index 62fd19f1a..1a12672a3 100644
--- a/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_end.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_end.yaml
@@ -4,5 +4,5 @@ values:
     value: 60000
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference: https://www.moneyadviceservice.org.uk/en/articles/changes-to-child-benefit-from-2013
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_start.yaml b/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_start.yaml
index b6764d0ac..95af91fa5 100644
--- a/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_start.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/charges/CB_HITC/phase_out_start.yaml
@@ -4,5 +4,5 @@ values:
     value: 50000
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference: https://www.moneyadviceservice.org.uk/en/articles/changes-to-child-benefit-from-2013
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/dividends.yaml b/openfisca_uk/parameters/tax/income_tax/rates/dividends.yaml
index ab24b7fa8..9169baeda 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/dividends.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/dividends.yaml
@@ -15,6 +15,6 @@ brackets:
 metadata:
   period: year
   type: marginal_rate
-  threshold_unit: currency
+  threshold_unit: currency-GBP
   rate_unit: /1
   reference: https://www.gov.uk/government/publications/rates-and-allowances-income-tax/income-tax-rates-and-allowances-current-and-past
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/savings_starter_rate/allowance.yaml b/openfisca_uk/parameters/tax/income_tax/rates/savings_starter_rate/allowance.yaml
index 83ed87c65..46ae6bfd6 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/savings_starter_rate/allowance.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/savings_starter_rate/allowance.yaml
@@ -3,5 +3,5 @@ values:
   2010-06-01: 5000
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.gov.uk/apply-tax-free-interest-on-savings
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/scotland/post_starter_rate.yaml b/openfisca_uk/parameters/tax/income_tax/rates/scotland/post_starter_rate.yaml
index 10ad6d4c7..129605dd9 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/scotland/post_starter_rate.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/scotland/post_starter_rate.yaml
@@ -29,6 +29,6 @@ brackets:
 metadata:
   period: year
   type: marginal_rate
-  threshold_unit: currency
+  threshold_unit: currency-GBP
   rate_unit: /1
   reference: https://www.gov.uk/government/publications/rates-and-allowances-income-tax/income-tax-rates-and-allowances-current-and-past
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/scotland/pre_starter_rate.yaml b/openfisca_uk/parameters/tax/income_tax/rates/scotland/pre_starter_rate.yaml
index f4cd37643..74d2217dc 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/scotland/pre_starter_rate.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/scotland/pre_starter_rate.yaml
@@ -17,6 +17,6 @@ brackets:
 metadata:
   period: year
   type: marginal_rate
-  threshold_unit: currency
+  threshold_unit: currency-GBP
   rate_unit: /1
   reference: https://www.gov.uk/government/publications/rates-and-allowances-income-tax/income-tax-rates-and-allowances-current-and-past
\ No newline at end of file
diff --git a/openfisca_uk/parameters/tax/income_tax/rates/uk.yaml b/openfisca_uk/parameters/tax/income_tax/rates/uk.yaml
index fbbf245c6..8a57453cd 100644
--- a/openfisca_uk/parameters/tax/income_tax/rates/uk.yaml
+++ b/openfisca_uk/parameters/tax/income_tax/rates/uk.yaml
@@ -20,6 +20,6 @@ brackets:
 metadata:
   period: year
   type: marginal_rate
-  threshold_unit: currency
+  threshold_unit: currency-GBP
   rate_unit: /1
   reference: https://www.gov.uk/government/publications/rates-and-allowances-income-tax/income-tax-rates-and-allowances-current-and-past
\ No newline at end of file
diff --git a/openfisca_uk/reforms/presets/current_date.py b/openfisca_uk/reforms/presets/current_date.py
index 3a6f35ac6..9591c812c 100644
--- a/openfisca_uk/reforms/presets/current_date.py
+++ b/openfisca_uk/reforms/presets/current_date.py
@@ -1,12 +1,8 @@
 from openfisca_core.model_api import *
 from openfisca_core.parameters.parameter_scale import ParameterScale
-from openfisca_core.parameters.parameter_scale_bracket import (
-    ParameterScaleBracket,
-)
 from openfisca_uk.entities import *
 from openfisca_uk.tools.general import *
 from datetime import datetime
-from openfisca_uk import CountryTaxBenefitSystem
 
 DATE = datetime.now()
 YEAR, MONTH, DAY = DATE.year, DATE.month, DATE.day


Test patch:
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/earn_disregard.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/earn_disregard.yaml
index 1c39bee0a..163425ac0 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/earn_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_couple.yaml
index f665215f5..4779ad6c2 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 10.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone.yaml
index 31ba12c91..dcdfea11b 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone.yaml
@@ -4,5 +4,5 @@ values:
     value: 20.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone_parent.yaml
index 2ec05c18f..4555b4ca5 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_lone_parent.yaml
@@ -4,5 +4,5 @@ values:
     value: 20.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_single.yaml
index b48b9d138..2851a46b5 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/income_disregard_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/pension_disregard.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/pension_disregard.yaml
index 61086f62b..772d56565 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/pension_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 50.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/LHA/means_test/worker_income_disregard.yaml b/openfisca_uk/parameters/benefit/LHA/means_test/worker_income_disregard.yaml
index b4bd949b6..3d957625d 100644
--- a/openfisca_uk/parameters/benefit/LHA/means_test/worker_income_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/LHA/means_test/worker_income_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 30
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/251256/hb-claims-processing-guidance.pdf
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/earn_disregard.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/earn_disregard.yaml
index 2ad266453..fd9e35bac 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/earn_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=40
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_couple.yaml
index b5112dacb..b28358f89 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 10.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=40
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_lone_parent.yaml
index 04acdda92..02d18a663 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_lone_parent.yaml
@@ -4,5 +4,5 @@ values:
     value: 25.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=40
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_single.yaml
index 060ae9952..1d4c5e561 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/income_disregard_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: hhttps://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=40
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/pension_disregard.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/pension_disregard.yaml
index 426e8bc0b..9c72db55c 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/pension_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 50.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=40
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_income_disregard.yaml b/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_income_disregard.yaml
index e6ee5449e..de85c9f7e 100644
--- a/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_income_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/housing_benefit/means_test/worker_income_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 37.10
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/251256/hb-claims-processing-guidance.pdf
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/earn_disregard.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/earn_disregard.yaml
index 57be1a127..4567296da 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/earn_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_couple.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_couple.yaml
index 50b688e35..8ecd3a54f 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_couple.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_couple.yaml
@@ -4,5 +4,5 @@ values:
     value: 10.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_lone_parent.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_lone_parent.yaml
index ef2acbe92..25052e83b 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_lone_parent.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_lone_parent.yaml
@@ -4,5 +4,5 @@ values:
     value: 20.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_single.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_single.yaml
index 5f8f8c4ca..5770756fd 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_single.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/income_disregard_single.yaml
@@ -4,5 +4,5 @@ values:
     value: 5.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=33
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/income_support/means_test/pension_disregard.yaml b/openfisca_uk/parameters/benefit/income_support/means_test/pension_disregard.yaml
index 51fab1e7e..62827817f 100644
--- a/openfisca_uk/parameters/benefit/income_support/means_test/pension_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/income_support/means_test/pension_disregard.yaml
@@ -4,5 +4,5 @@ values:
     value: 50.00
 metadata:
   period: week
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=24
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold.yaml b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold.yaml
index 304bc8b8a..d1a0c075c 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold.yaml
@@ -9,7 +9,7 @@ values:
     value: 6565
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold_CTC_only.yaml b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold_CTC_only.yaml
index 07d1a3c74..abb8d918d 100644
--- a/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold_CTC_only.yaml
+++ b/openfisca_uk/parameters/benefit/tax_credits/means_test/income_threshold_CTC_only.yaml
@@ -9,7 +9,7 @@ values:
     value: 16480
 metadata:
   period: year
-  unit: currency
+  unit: currency-GBP
   reference:
   - https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=28
   - https://www.gov.uk/government/publications/rates-and-allowances-tax-credits-child-benefit-and-guardians-allowance/tax-credits-child-benefit-and-guardians-allowance
diff --git a/openfisca_uk/parameters/benefit/universal_credit/means_test/earn_disregard.yaml b/openfisca_uk/parameters/benefit/universal_credit/means_test/earn_disregard.yaml
index 0f6711315..08d4d70c5 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/means_test/earn_disregard.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/means_test/earn_disregard.yaml
@@ -8,5 +8,5 @@ values:
     value: 503.00
 metadata:
   period: month
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=47
\ No newline at end of file
diff --git a/openfisca_uk/parameters/benefit/universal_credit/means_test/earn_disregard_with_housing.yaml b/openfisca_uk/parameters/benefit/universal_credit/means_test/earn_disregard_with_housing.yaml
index 7af0613d2..b81221868 100644
--- a/openfisca_uk/parameters/benefit/universal_credit/means_test/earn_disregard_with_housing.yaml
+++ b/openfisca_uk/parameters/benefit/universal_credit/means_test/earn_disregard_with_housing.yaml
@@ -4,5 +4,5 @@ values:
     value: 290
 metadata:
   period: month
-  unit: currency
+  unit: currency-GBP
   reference: https://www.iser.essex.ac.uk/files/projects/UKMOD/EUROMOD_country_report.pdf#page=47
\ No newline at end of file
diff --git a/openfisca_uk/tests/graphs/test_hypothetical_graphs.py b/openfisca_uk/tests/graphs/test_hypothetical_graphs.py
index 75cd2e108..5f326d5fd 100644
--- a/openfisca_uk/tests/graphs/test_hypothetical_graphs.py
+++ b/openfisca_uk/tests/graphs/test_hypothetical_graphs.py
@@ -1,4 +1,4 @@
-from openfisca_uk.graphs import waterfall_chart, mtr_chart, budget_chart
+from openfisca_uk.graphs import mtr_chart, budget_chart
 from openfisca_uk import BASELINE_PARAMETERS
 from openfisca_uk.api import reforms, graphs, BASELINE_PARAMETERS
 
diff --git a/openfisca_uk/tests/microsimulation/frs/test_against_ukmod.py b/openfisca_uk/tests/microsimulation/frs/test_against_ukmod.py
index fccfbbdba..694a90c9d 100644
--- a/openfisca_uk/tests/microsimulation/frs/test_against_ukmod.py
+++ b/openfisca_uk/tests/microsimulation/frs/test_against_ukmod.py
@@ -2,16 +2,13 @@
 This module tests the FRS dataset produced by openfisca-uk-data against UKMOD - checking that the distributions are similar.
 """
 
-import numpy as np
 import pandas as pd
 from openfisca_uk_data import FRS, UKMODOutput
 from openfisca_uk import Microsimulation, REPO
 import pytest
-from microdf import MicroDataFrame, MicroSeries
+from microdf import MicroDataFrame
 from openfisca_uk.reforms.presets.current_date import use_current_parameters
 from openfisca_uk.tools.parameters import backdate_parameters
-from itertools import product
-from functools import partial
 import yaml
 
 TEST_YEAR = 2018
diff --git a/openfisca_uk/tests/microsimulation/test_validity.py b/openfisca_uk/tests/microsimulation/test_validity.py
index 193143118..196f194b7 100644
--- a/openfisca_uk/tests/microsimulation/test_validity.py
+++ b/openfisca_uk/tests/microsimulation/test_validity.py
@@ -1,5 +1,4 @@
-from openfisca_uk import CountryTaxBenefitSystem, Microsimulation
-from itertools import product
+from openfisca_uk import Microsimulation
 import pytest
 from openfisca_uk_data import FRS