[System] Kill some Uri static fields
Add failing Uri test