Create a test suit for crossref and fix a bug
Update documentation and naming
Remove fixed TODOs