diff --git a/tests/data/Style/NumberFormat.php b/tests/data/Style/NumberFormat.php
index 0124c32448..02ef1b809a 100644
--- a/tests/data/Style/NumberFormat.php
+++ b/tests/data/Style/NumberFormat.php
@@ -1,5 +1,7 @@
 <?php
 
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
 //  value, format, result
 
 return [
@@ -539,4 +541,715 @@
         25.255555555555555,
         '"pfx." 0.00;"pfx." -0.00;"pfx." 0.00;',
     ],
+    [
+        '1',
+        '1.000',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '-1',
+        '-1.000',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '1',
+        '1',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '-1',
+        '-1',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '0',
+        '0',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '0',
+        '-0',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '1',
+        '1.1',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '1',
+        '1.4',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '2',
+        '1.5',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '2',
+        '1.9',
+        NumberFormat::FORMAT_NUMBER,
+    ],
+    [
+        '0.00',
+        '0',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '1.00',
+        '1',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '1.11',
+        '1.111',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '1.11',
+        '1.114',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '1.12',
+        '1.115',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '1.12',
+        '1.119',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '0.00',
+        '-0',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '-1.00',
+        '-1',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '-1.11',
+        '-1.111',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '-1.11',
+        '-1.114',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '-1.12',
+        '-1.115',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '-1.12',
+        '-1.119',
+        NumberFormat::FORMAT_NUMBER_00,
+    ],
+    [
+        '0.00',
+        '0',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '1,000.00',
+        '1000',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '1,111.11',
+        '1111.111',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '1,111.11',
+        '1111.114',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '1,111.12',
+        '1111.115',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '1,111.12',
+        '1111.119',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '0.00',
+        '-0',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '-1,111.00',
+        '-1111',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '-1,111.11',
+        '-1111.111',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '-1,111.11',
+        '-1111.114',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '-1,111.12',
+        '-1111.115',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '-1,111.12',
+        '-1111.119',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+    ],
+    [
+        '0.00 ',
+        '0',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '1,000.00 ',
+        '1000',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '1,111.11 ',
+        '1111.111',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '1,111.11 ',
+        '1111.114',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '1,111.12 ',
+        '1111.115',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '1,111.12 ',
+        '1111.119',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '0.00 ',
+        '-0',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '-1,111.00 ',
+        '-1111',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '-1,111.11 ',
+        '-1111.111',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '-1,111.11 ',
+        '-1111.114',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '-1,111.12 ',
+        '-1111.115',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    [
+        '-1,111.12 ',
+        '-1111.119',
+        NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED2,
+    ],
+    // Tests for FORMAT_PERCENTAGE, FORMAT_PERCENTAGE_00 currently fail. Fix & tests will be provided in #2555
+    [
+        '$0.00 ',
+        '0',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,000.00 ',
+        '1000',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,111.11 ',
+        '1111.111',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,111.11 ',
+        '1111.114',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,111.12 ',
+        '1111.115',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,111.12 ',
+        '1111.119',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$0.00 ',
+        '-0',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.00 ',
+        '-1111',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.11 ',
+        '-1111.111',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.11 ',
+        '-1111.114',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.12 ',
+        '-1111.115',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.12 ',
+        '-1111.119',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$0 ',
+        '0',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,000 ',
+        '1000',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,111 ',
+        '1111.1',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,111 ',
+        '1111.4',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,112 ',
+        '1111.5',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,112 ',
+        '1111.9',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$0 ',
+        '-0',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,111 ',
+        '-1111',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,111 ',
+        '-1111.1',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,111 ',
+        '-1111.4',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,112 ',
+        '-1111.5',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,112 ',
+        '-1111.9',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$0.00 ',
+        '0',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,000.00 ',
+        '1000',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,111.11 ',
+        '1111.111',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,111.11 ',
+        '1111.114',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,111.12 ',
+        '1111.115',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$1,111.12 ',
+        '1111.119',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$0.00 ',
+        '-0',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.00 ',
+        '-1111',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.11 ',
+        '-1111.111',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.11 ',
+        '-1111.114',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.12 ',
+        '-1111.115',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$-1,111.12 ',
+        '-1111.119',
+        NumberFormat::FORMAT_CURRENCY_USD_SIMPLE,
+    ],
+    [
+        '$0 ',
+        '0',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,000 ',
+        '1000',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,111 ',
+        '1111.1',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,111 ',
+        '1111.4',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,112 ',
+        '1111.5',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$1,112 ',
+        '1111.9',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$0 ',
+        '-0',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,111 ',
+        '-1111',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,111 ',
+        '-1111.1',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,111 ',
+        '-1111.4',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,112 ',
+        '-1111.5',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '$-1,112 ',
+        '-1111.9',
+        NumberFormat::FORMAT_CURRENCY_USD,
+    ],
+    [
+        '0.00 €',
+        '0',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '1,000.00 €',
+        '1000',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '1,111.11 €',
+        '1111.111',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '1,111.11 €',
+        '1111.114',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '1,111.12 €',
+        '1111.115',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '1,111.12 €',
+        '1111.119',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '0.00 €',
+        '-0',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '-1,111.00 €',
+        '-1111',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '-1,111.11 €',
+        '-1111.111',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '-1,111.11 €',
+        '-1111.114',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '-1,111.12 €',
+        '-1111.115',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '-1,111.12 €',
+        '-1111.119',
+        NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE,
+    ],
+    [
+        '0 €',
+        '0',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '1,000 €',
+        '1000',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '1,111 €',
+        '1111.1',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '1,111 €',
+        '1111.4',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '1,112 €',
+        '1111.5',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '1,112 €',
+        '1111.9',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '0 €',
+        '-0',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '-1,111 €',
+        '-1111',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '-1,111 €',
+        '-1111.1',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '-1,111 €',
+        '-1111.4',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '-1,112 €',
+        '-1111.5',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        '-1,112 €',
+        '-1111.9',
+        NumberFormat::FORMAT_CURRENCY_EUR,
+    ],
+    [
+        ' $ - ',
+        '0',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ 1,000.00 ',
+        '1000',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ 1,111.11 ',
+        '1111.111',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ 1,111.11 ',
+        '1111.114',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ 1,111.12 ',
+        '1111.115',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ 1,111.12 ',
+        '1111.119',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ - ',
+        '-0',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ (1,111.00)',
+        '-1111',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ (1,111.11)',
+        '-1111.111',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ (1,111.11)',
+        '-1111.114',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ (1,111.12)',
+        '-1111.115',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' $ (1,111.12)',
+        '-1111.119',
+        NumberFormat::FORMAT_ACCOUNTING_USD,
+    ],
+    [
+        ' € - ',
+        '0',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € 1,000.00 ',
+        '1000',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € 1,111.11 ',
+        '1111.111',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € 1,111.11 ',
+        '1111.114',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € 1,111.12 ',
+        '1111.115',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € 1,111.12 ',
+        '1111.119',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € - ',
+        '-0',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € (1,111.00)',
+        '-1111',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € (1,111.11)',
+        '-1111.111',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € (1,111.11)',
+        '-1111.114',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € (1,111.12)',
+        '-1111.115',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
+    [
+        ' € (1,111.12)',
+        '-1111.119',
+        NumberFormat::FORMAT_ACCOUNTING_EUR,
+    ],
 ];