fix() : change app wrapping

This allows sending an connection handler, along with the app to wrap
The unit tests are working with this patch