Just making the staging spec a little more robust (and adding a couple of tests).
Fixed staging configs.  Ooops.  ...Hard to notice these problems when we don't use staging, heh.