Fix spec issues from with expectations on the old calls.

Fixes issues from PR #81 (ee267dc)

@dclarizio Please review.