Allow even more appendix paragraphs
Fix tests