add some more testing
add some more testing

 * make the code clearer for people who might follow ...

bottlepy/bottle,oz123/bottle,ifduyue/bottle,defnull/bottle,defnull/bottle,ifduyue/bottle,bottlepy/bottle,Inndy/bottle,oz123/bottle,fkazimierczak/bottle,fkazimierczak/bottle,Inndy/bottle