More work on NumberFormat + ported some more tests.