Just making the staging spec a little more robust (and adding a couple of tests).