Recategorized string unit tests.
Began adding a proto parser and model when it became clear the the TokenReader needed to change.