diff --git a/hledger/test/cli/commodity-style.test b/hledger/test/cli/commodity-style.test
index 93c11eb3f..16ed9e14d 100644
--- a/hledger/test/cli/commodity-style.test
+++ b/hledger/test/cli/commodity-style.test
@@ -11,7 +11,7 @@
 
 $ hledger -f- print -c '10 00'
 2021-07-09 no symbol
-    (a)           12 34
+    (a)          12 34.
 
 2021-07-09 Euro
     (a)    EUR 1.234,56
@@ -45,17 +45,17 @@ $ hledger -f- print -c 'EUR 1.000,00' -c '$ 1,000.00'
 
 $ hledger -f- print -c 'EUR 1.000,00' -c 'EUR 1,000.00'
 2021-07-09 Euro
-    (a)    EUR 1,234.00
+    (a)      EUR 1,234.
 
 >=
 
 # 4. Commodity styles are applied to quantity and price of a commodity (except for precision)
 <
 2021-09-12 buy A
-    (a)    1,234 A @ $ 1234,56
+    (a)    1,234 A @ 1234,56 $
 
-$ hledger -f- print -c '1,000.0 $' -c 'A 1000.0'
+$ hledger -f- print -c '$1,000.0' -c 'A1000.0'
 2021-09-12 buy A
-    (a)    A 1.234 @ 1,234.56 $
+    (a)    A1.234 @ $1,234.56
 
 >=
diff --git a/hledger/test/close.test b/hledger/test/close.test
index fd6a687b9..88dbd222a 100644
--- a/hledger/test/close.test
+++ b/hledger/test/close.test
@@ -212,22 +212,22 @@ commodity AAA 0.00000000
 
 $ hledger -f- close -p 2019 assets --show-costs -x
 2019-12-31 closing balances
-    assets:aaa                                       AAA -510.00000000 = AAA 0.00000000
-    assets:usd                                                 $-49.50
-    assets:usd                          $49.390001 @ AAA 10.3528242505 = $0.00
-    equity:opening/closing balances                             $49.50
-    equity:opening/closing balances    $-49.390001 @ AAA 10.3528242505
-    equity:opening/closing balances                   AAA 510.00000000
+    assets:aaa                                              AAA -510 = AAA 0
+    assets:usd                                               $-49.50
+    assets:usd                          $49.3900010 @ AAA 10.3528243 = $0.0000000
+    equity:opening/closing balances                           $49.50
+    equity:opening/closing balances    $-49.3900010 @ AAA 10.3528243
+    equity:opening/closing balances                          AAA 510
 
 >=0
 
 # 14. The same, without costs and with --interleaved.
 $ hledger -f- close -p 2019 assets --interleaved -x
 2019-12-31 closing balances
-    assets:aaa                         AAA -510.00000000 = AAA 0.00000000
-    equity:opening/closing balances     AAA 510.00000000
-    assets:usd                                $-0.109999 = $0.00
-    equity:opening/closing balances            $0.109999
+    assets:aaa                             AAA -510 = AAA 0
+    equity:opening/closing balances         AAA 510
+    assets:usd                          $-0.1099990 = $0.0000000
+    equity:opening/closing balances      $0.1099990
 
 >=0
 
diff --git a/hledger/test/csv.test b/hledger/test/csv.test
index 58948dea4..b16a4ea4f 100644
--- a/hledger/test/csv.test
+++ b/hledger/test/csv.test
@@ -219,8 +219,8 @@ account4 the:remainder
 
 $  ./csvtest.sh
 2009-09-10 Flubber Co
-    assets:myacct          $50.000 = $321
-    income:unknown        $-50.000 = $123
+    assets:myacct              $50 = $321
+    income:unknown            $-50 = $123
     expenses:tax            $0.234  ; VAT
     the:remainder
 
@@ -903,7 +903,8 @@ $  ./csvtest.sh
 
 >=0
 
-# 45. decimal-mark helps parse ambiguous decimals correctly
+# 45. decimal-mark helps parse ambiguous decimals correctly.
+# Here it's one thousand, one.
 <
 2020-01-01,"1,000"
 2020-01-02,"1.000"
@@ -914,8 +915,8 @@ decimal-mark .
 
 $  ./csvtest.sh
 2020-01-01
-    expenses:unknown       1,000.000
-    income:unknown        -1,000.000
+    expenses:unknown          1,000.
+    income:unknown           -1,000.
 
 2020-01-02
     expenses:unknown           1.000
@@ -923,7 +924,8 @@ $  ./csvtest.sh
 
 >=
 
-# 46. decimal-mark again
+# 46. Again, this time with comma as decimal mark.
+# Here it's one, one thousand.
 <
 2020-01-01,"1,000"
 2020-01-02,"1.000"
@@ -938,8 +940,8 @@ $  ./csvtest.sh
     income:unknown            -1,000
 
 2020-01-02
-    expenses:unknown       1.000,000
-    income:unknown        -1.000,000
+    expenses:unknown          1.000,
+    income:unknown           -1.000,
 
 >=
 
diff --git a/hledger/test/journal/amounts-and-commodities.test b/hledger/test/journal/amounts-and-commodities.test
index 3ea153e87..8bb5ea38c 100644
--- a/hledger/test/journal/amounts-and-commodities.test
+++ b/hledger/test/journal/amounts-and-commodities.test
@@ -240,7 +240,7 @@ $ hledger -f- print cur:A1 amt:2
 
 $ hledger -f- print cur:A amt:12
 2021-01-01
-    (a)            A1 2
+    (a)           A1 2.
 
 >=
 
@@ -252,7 +252,7 @@ $ hledger -f- print cur:A amt:12
 
 $ hledger -f- print cur:A amt:12
 2021-01-01
-    (a)            1 2A
+    (a)           1 2.A
 
 >=
 
@@ -293,7 +293,7 @@ $ hledger -f- print cur:e amt:100
 
 $ hledger -f- print cur: amt:1112
 2021-01-01
-    (a)           111 2
+    (a)          111 2.
 
 >=
 
diff --git a/hledger/test/journal/costs.test b/hledger/test/journal/costs.test
index 4cd6cea19..e391617c9 100644
--- a/hledger/test/journal/costs.test
+++ b/hledger/test/journal/costs.test
@@ -71,11 +71,11 @@ $ hledger -f - print --explicit
 $ hledger -f - print --explicit
 2011-01-01
     expenses:foreign currency    €100 @ $1.35
-    misc                                $2.10
+    misc                                 $2.1
     assets                           $-135.00
     misc                           €1 @ $1.35
     misc                          €-1 @ $1.35
-    misc                               $-2.10
+    misc                                $-2.1
 
 >=0
 
@@ -591,17 +591,17 @@ $ hledger -f- print
 
 $ hledger -f- print --infer-costs
 2011-01-01
-    expenses:foreign currency    €100.00 @ $1.35
-    expenses:foreign currency       £100 @ $1.36
-    expenses:foreign currency     ¥1000 @@ €8.00
-    equity:conversion                   €-100.00
-    equity:conversion                       $135
-    equity:conversion                      £-100
-    equity:conversion                       $136
-    equity:conversion                     ¥-1000
-    equity:conversion                      €8.00
-    assets                                 $-271
-    assets                                €-8.00
+    expenses:foreign currency      €100 @ $1.35
+    expenses:foreign currency      £100 @ $1.36
+    expenses:foreign currency    ¥1000 @@ €8.00
+    equity:conversion                     €-100
+    equity:conversion                      $135
+    equity:conversion                     £-100
+    equity:conversion                      $136
+    equity:conversion                    ¥-1000
+    equity:conversion                     €8.00
+    assets                                $-271
+    assets                               €-8.00
 
 >=0
 
diff --git a/hledger/test/journal/include.test b/hledger/test/journal/include.test
index ccf96b881..3711bf9b9 100644
--- a/hledger/test/journal/include.test
+++ b/hledger/test/journal/include.test
@@ -23,7 +23,7 @@ include a.timeclock
 include b.timedot
 $ hledger -f - print
 2016-01-01
-    (x)            1.00
+    (x)               1
 
 2016-01-01 * 12:00-16:00
     (a:aa)           4.00h
diff --git a/hledger/test/journal/precision.test b/hledger/test/journal/precision.test
index 54b45f777..dfac0a04a 100644
--- a/hledger/test/journal/precision.test
+++ b/hledger/test/journal/precision.test
@@ -131,7 +131,7 @@ $ hledger -f- print --explicit
 $ hledger -f- print --explicit
 2015-01-01
     e    E 10.0000 @ F 15.2380952
-    e    E 11.0000 @ F 15.2380952
+    e         E 11 @ F 15.2380952
     f                  F -320.000
 
 >= 0
diff --git a/hledger/test/journal/scientific.test b/hledger/test/journal/scientific.test
index 84280fa38..9566fdc32 100644
--- a/hledger/test/journal/scientific.test
+++ b/hledger/test/journal/scientific.test
@@ -1,4 +1,4 @@
-# just check
+# 1. just check
 <
 D $1,000.00
 
@@ -7,7 +7,7 @@ D $1,000.00
 $ hledger -f - bal --no-total
                $2.30  a
 
-# some basic cases with commodity
+# 2. some basic cases with commodity
 <
 commodity $1,000.00000000
 
@@ -22,7 +22,7 @@ $ hledger -f - bal --no-total
      $1,000.00000000  c
     $-1,108.14159260  d
 
-# some basic cases with commodity
+# 3. some basic cases with commodity
 <
 commodity $1,000.00000000
 
@@ -33,14 +33,14 @@ commodity $1,000.00000000
    d
 $ hledger -f - print --explicit
 2018-01-01
-    a       $105.00000000
-    b         $3.14159260
-    c     $1,000.00000000
+    a                $105
+    b          $3.1415926
+    c             $1,000.
     d    $-1,108.14159260
 
 >=
 
-# some basic cases
+# 4. some basic cases
 <
 2018/1/1
    a  1.05e2
@@ -53,7 +53,7 @@ $ hledger -f - bal --no-total
         1000.0000000  c
        -1108.1415926  d
 
-# we still should recognize commodities with e
+# 5. we still should recognize commodities with e
 <
 2018/1/1
    (a)  1.00005e
@@ -62,6 +62,7 @@ $ hledger -f - bal --no-total
             2.00003E
             1.00005e  a
 
+# 6.
 <
 2018/1/1
    (a)  1,000.5e-1
diff --git a/hledger/test/rewrite.test b/hledger/test/rewrite.test
index 35ebff656..46a1d1a10 100644
--- a/hledger/test/rewrite.test
+++ b/hledger/test/rewrite.test
@@ -181,19 +181,19 @@ $ hledger rewrite -f- assets:bank and 'amt:<0' --add-posting 'expenses:fee  $5'
 
 $ hledger rewrite -f- date:2017/1  --add-posting 'Here comes Santa  $0' --verbose-tags
 2016-12-31  ; modified:
-    expenses:housing         $600.00
-    (budget:housing)        $-600.00  ; generated-posting: = ^expenses:housing
+    expenses:housing            $600
+    (budget:housing)           $-600  ; generated-posting: = ^expenses:housing
     assets:cash
 
 2017-01-01  ; modified:
-    expenses:food             $20.00
-    (budget:food)            $-20.00  ; generated-posting: = ^expenses:grocery ^expenses:food
+    expenses:food                $20
+    (budget:food)               $-20  ; generated-posting: = ^expenses:grocery ^expenses:food
     Here comes Santa              $0  ; generated-posting: = date:2017/1
-    expenses:leisure          $15.00
-    (budget:misc)            $-15.00  ; generated-posting: = ^expenses not:housing not:grocery not:food
+    expenses:leisure             $15
+    (budget:misc)               $-15  ; generated-posting: = ^expenses not:housing not:grocery not:food
     Here comes Santa              $0  ; generated-posting: = date:2017/1
-    expenses:grocery          $30.00
-    (budget:food)            $-30.00  ; generated-posting: = ^expenses:grocery ^expenses:food
+    expenses:grocery             $30
+    (budget:food)               $-30  ; generated-posting: = ^expenses:grocery ^expenses:food
     Here comes Santa              $0  ; generated-posting: = date:2017/1
     assets:cash
     Here comes Santa              $0  ; generated-posting: = date:2017/1