Changes to the WrapperTest