Adding a unit test confirming _wrapper nesting, and removing some redundant proxying