Add a few more tests for wrap