UD pingpong and test cleanups