Parser test cleanup: only test for one thing at the time, ...