Forward kwargs correctly for calls in context

[martinemde]

I haven't gotten the tests working locally so I'm writing the test blind, but I think it will work.