Fix spec issues from expectations on old calls.

Fixes issues from PR #81 (ee267dc)