Update app and tests to correctly format numbers