Tests and fixes for wrapped tracking
Tests and fixes for Ads merging