Merge "Add tests to services/tests/net test mapping"