Updated tracking tests