Fix broken tests and a bug which would mark interpetations as an appendix