Fix contrib key manual entry; add tests.
Merge pull request #1237 from NatTuck/manual-entry-and-test

Fix contrib key manual entry; add tests.