Fixed WRAP-INNER
Fixed up all tests; all pass.