Refactored the extraction of bibtex information
Refactored tests to match the refactored source code