Remove redundant number formatter method
Add unit tests

Now the overall coverage is 95%