Fix a couple of failing tests missed during earlier fixes.
Fix a couple of failing tests missed during earlier fixes.

ericsnowcurrently/juju,thomnico/juju,thomnico/juju,voidspace/juju,tsakas/juju,Altoros/juju-vmware,frankban/juju,marcmolla/juju,fwereade/juju,sinzui/juju,thomnico/juju,sinzui/juju,mjs/juju,howbazaar/juju,thomnico/juju,marcoceppi/juju,bz2/juju,bac/juju,frankban/juju,axw/juju,cloud-green/juju,Altoros/juju-cloudsigma,davecheney/juju,mikemccracken/juju,perrito666/juju,makyo/juju,anastasiamac/juju,Altoros/juju-vmware,howbazaar/juju,alesstimec/juju,kat-co/juju,tsakas/juju,Altoros/juju-vmware,Altoros/juju-vmware,tych0/juju,dimitern/juju,mhilton/juju,marcoceppi/juju,ericsnowcurrently/juju,voidspace/juju,dooferlad/juju,mikemccracken/juju,frankban/juju-tmp,ericsnowcurrently/juju,macgreagoir/juju,axw/juju,kat-co/juju,cloud-green/juju,bogdanteleaga/juju,bac/juju,mikemccracken/juju,tsakas/juju,marcmolla/juju,axw/juju,marcmolla/juju,cmars/juju,AdamIsrael/juju,bz2/juju,perrito666/juju,mhilton/juju-juju,perrito666/juju,mjs/juju,alesstimec/juju,perrito666/juju,tych0/juju,AdamIsrael/juju,tasdomas/juju,dooferlad/juju,cmars/juju,mjs/juju,ericsnowcurrently/juju,dooferlad/juju,axw/juju,mhilton/juju-juju,howbazaar/juju,bac/juju,howbazaar/juju,voidspace/juju,gabriel-samfira/juju,mhilton/juju-juju,marcmolla/juju,mjs/juju,axw/juju,bz2/juju,wwitzel3/juju,cmars/juju,fwereade/juju,alesstimec/juju,gabriel-samfira/juju,bogdanteleaga/juju,Altoros/juju-cloudsigma,davecheney/juju,frankban/juju-tmp,mhilton/juju,perrito666/juju,alesstimec/juju,Altoros/juju-cloudsigma,ericsnowcurrently/juju,dooferlad/juju,anastasiamac/juju,gabriel-samfira/juju,bac/juju,sinzui/juju,waigani/juju,cherylj/juju,mhilton/juju,kat-co/juju,reedobrien/juju,cloud-green/juju,kat-co/juju,marcoceppi/juju,cherylj/juju,tasdomas/juju,mikemccracken/juju,voidspace/juju,macgreagoir/juju,waigani/juju,makyo/juju,tasdomas/juju,bz2/juju,anastasiamac/juju,waigani/juju,dimitern/juju,gabriel-samfira/juju,davecheney/juju,davecheney/juju,dooferlad/juju,reedobrien/juju,frankban/juju-tmp,bac/juju,AdamIsrael/juju,AdamIsrael/juju,dimitern/juju,cherylj/juju,frankban/juju,tych0/juju,mikemccracken/juju,mjs/juju,anastasiamac/juju,dimitern/juju,reedobrien/juju,frankban/juju,wwitzel3/juju,frankban/juju-tmp,dimitern/juju,mhilton/juju-juju,gabriel-samfira/juju,waigani/juju,mjs/juju,bogdanteleaga/juju,cmars/juju,macgreagoir/juju,mjs/juju,bogdanteleaga/juju,bz2/juju,macgreagoir/juju,macgreagoir/juju,frankban/juju,fwereade/juju,anastasiamac/juju,tasdomas/juju,reedobrien/juju,sinzui/juju,tsakas/juju,marcmolla/juju,wwitzel3/juju,fwereade/juju,makyo/juju,makyo/juju,alesstimec/juju,mhilton/juju,marcoceppi/juju,cherylj/juju,cloud-green/juju,kat-co/juju,tych0/juju,howbazaar/juju,Altoros/juju-cloudsigma,wwitzel3/juju,reedobrien/juju