Fixed all non-passing tests in call_spec

The only non-passing tests remaining (though there are admittedly a lot, I think they're all related) are in wrapper_spec.rb.

Partially fixes issue #36. For real this time.