More tests for new parsing