Fix for the failing wrapper tests.
Merge pull request #775 from fmoloney/FixWrapperTests

Fix for the failing wrapper tests.