Also, these changes cause all tests to timeout in this block except null wrapper.