Remove singleton definitions and references from UVE UT code
Merge pull request #182 from Juniper/bugs

Remove singleton definitions and references from UVE UT code