Tracking Uri classes and tests