Merge "Move network admin test classes under admin path"