Refactor tests and citations, add citations controller model