Some more tests + some fixes because of them

- Format Parser will now eat surrounding whitespace
- FormatToken Parser will now not eat surrounding whitespace; it was breaking other parsers expectations
- Whitespace between symbols expressing AND can now be more than a single piece of whitespace