Reverted some changes to test_wrappers.