add the key to callback methods

This necessitates changing the test methods as they don't expect to
receive the key