Adapt tests
Fix bug in AsyncTargetWrapper