Working Wrap(...) with tests