Add tracking and tracing tests