2.0 udc integration test fixes