Fix indentation in grammar
Fix whitespace tests
Implement eol tests