Finally getting things cleaned up and building again.
And fixing up the UniqueId test cases to end the night.