These are about to get even longer, so it makes sense to separate them. Also refactor the remaining parser tests to remove some duplication.