Merge "Allow test+other networks to have specifiers"