Fix contrib key manual entry; add tests.

#1231