Merge "Cleanup subnet creation in network api tests"