test refactors and fixes
test refactors and fixes

frankban/juju,reedobrien/juju,wwitzel3/juju,makyo/juju,frankban/juju,howbazaar/juju,dooferlad/juju,AdamIsrael/juju,makyo/juju,marcmolla/juju,ericsnowcurrently/juju,axw/juju,voidspace/juju,voidspace/juju,anastasiamac/juju,bz2/juju,waigani/juju,fwereade/juju,gabriel-samfira/juju,bz2/juju,makyo/juju,bogdanteleaga/juju,bogdanteleaga/juju,mikemccracken/juju,frankban/juju,mjs/juju,perrito666/juju,ericsnowcurrently/juju,dimitern/juju,kat-co/juju,waigani/juju,marcmolla/juju,axw/juju,AdamIsrael/juju,kat-co/juju,reedobrien/juju,perrito666/juju,mjs/juju,kat-co/juju,voidspace/juju,dimitern/juju,mikemccracken/juju,anastasiamac/juju,dooferlad/juju,perrito666/juju,bz2/juju,dooferlad/juju,davecheney/juju,AdamIsrael/juju,macgreagoir/juju,dimitern/juju,mikemccracken/juju,kat-co/juju,alesstimec/juju,fwereade/juju,ericsnowcurrently/juju,anastasiamac/juju,mikemccracken/juju,davecheney/juju,bz2/juju,dooferlad/juju,bz2/juju,bac/juju,gabriel-samfira/juju,wwitzel3/juju,macgreagoir/juju,fwereade/juju,dimitern/juju,wwitzel3/juju,bac/juju,gabriel-samfira/juju,dooferlad/juju,marcmolla/juju,marcmolla/juju,bogdanteleaga/juju,mjs/juju,wwitzel3/juju,frankban/juju,mjs/juju,mjs/juju,alesstimec/juju,gabriel-samfira/juju,makyo/juju,reedobrien/juju,ericsnowcurrently/juju,alesstimec/juju,mjs/juju,axw/juju,waigani/juju,macgreagoir/juju,axw/juju,howbazaar/juju,howbazaar/juju,fwereade/juju,kat-co/juju,frankban/juju,waigani/juju,voidspace/juju,bac/juju,marcmolla/juju,mikemccracken/juju,AdamIsrael/juju,howbazaar/juju,mjs/juju,reedobrien/juju,macgreagoir/juju,reedobrien/juju,ericsnowcurrently/juju,perrito666/juju,davecheney/juju,anastasiamac/juju,macgreagoir/juju,gabriel-samfira/juju,perrito666/juju,davecheney/juju,bac/juju,alesstimec/juju,dimitern/juju,bac/juju,bogdanteleaga/juju,axw/juju,alesstimec/juju,howbazaar/juju,anastasiamac/juju