Restructured Citation class and test, modified tests json