Pass wrap() tests again