Fixes in unit tests
Parsing handles any prefix length, and user-defined symbols.
Minor refactorings.