fixed number formatting + added test case
Merge branch 'hotfix/number-formatting'