Minor cleanups
Cleanup and more tests work again
Cleanup author abbreviation test
Cleanup and few tests fixed