Fix broken volume and container tests

There are a handful of tests that aren't actually being run because
there are missing \ which is prevented the tests from being executed.
Additionally some of the test syntax was incorrect but not showing up
because these tests didn't run.

Signed-off-by: Alex Schultz <aschultz@redhat.com>

test/apiv2/20-containers.at

@@ -211,15 +211,11 @@ t GET containers/$cid/json 200 \
 t POST containers/create Image=$IMAGE Entrypoint='["top"]' 201 \
   .Id~[0-9a-f]\\{64\\}
 cid_top=$(jq -r '.Id' <<<"$output")
-network_expect="{}"
-if root; then
-    network_expect='.podman.NetworkID=podman'
-fi
 t GET containers/${cid_top}/json 200 \
   .Config.Entrypoint[0]="top" \
   .Config.Cmd='[]' \
-  .Path="top"
-  .NetworkSettings.Networks="$network_expect"
+  .Path="top" \
+  .NetworkSettings.Networks.podman.NetworkID=podman
 t POST  containers/${cid_top}/start 204
 # make sure the container is running
 t GET containers/${cid_top}/json 200 \

test/apiv2/30-volumes.at

@@ -13,13 +13,14 @@ t POST libpod/volumes/create name=foo1  201 \
     .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
     .Labels={} \
     .Options={}
+# TODO(mwhahaha): there might be a bug here since options is null and not {}
 t POST volumes/create 201 \
-    .Name~[0-9a-f]\\{64\\}
+    .Name~[0-9a-f]\\{64\\} \
     .Driver=local \
-    .Mountpoint=$volumepath/~[0-9a-f]\\{64\\}/_data \
+    .Mountpoint~$volumepath/[0-9a-f]\\{64\\}/_data \
     .CreatedAt~[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}.* \
     .Labels={} \
-    .Options={}
+    .Options=null
 t POST libpod/volumes/create 201
 t POST libpod/volumes/create \
   Name=foo2 \