Better number tokenizing, and tests!