Add tests, better comments about appendix markers