Merge "Move the network api tests to smoke"