More test expectations.
Merge pull request #182 from shans/update-more-tests

More test expectations.