fixed wrapping tests