Fix UG modules + first pass fixing module tests
More test fixes