Bibtex and CMDI tests updated