Removing number_format, adding tests.