2.1 udc integration test fixes