Fixed test after replacing tabs with spaces.
More parser tests and some parser fixes.