Further fixes to parsing tests.