Partial Cleanup of Cat1RoundtripTest