Revert + and - in NUMBER type; remove - from WORD type

Let user handle these characters as they see fit.
Add basic test to check that all types are parsing correctly