Added network test target and changed targets to match new test naming conventions.
Merge branch 'network_tests' into next