Merge "Move testNetworkPassedDoesNotRollback (3/n)"