Minor spec changes to get specs passing.
Merge pull request #3329 from petergoldstein/bugfix/green_specs

Minor spec changes to get specs passing.