Merge "Move network tests to new classes (1/n)"