Merge "Add imports to networking test mapping"