Remove singleton definitions and references from UVE UT code