major reorganization of Contributions tests
major reorganization of Contributions tests

This probably should've been more than one commit, but it got out of
hand and there is no going back.  It's madness, I say!

charlietanksley/contributions,charlietanksley/contributions