Adds Appendix D regexes and test