Change to a subscriber model for tracking events outside of AR
Fix warning on test inclusion