Better TOC bibliography matching and test