Added wrap option to printf plus tests