more test reorg
Merge pull request #14 from cdlib/citation

more test reorg