Assorted test fixes and merge conflicts
Update all uv tests to pass again