Fix inheritance problems for Zodiac tests.
Fix inheritance problems for Zodiac tests.

shivarammysore/faucet,trentindav/faucet,gizmoguy/faucet,faucetsdn/faucet,trungdtbk/faucet,anarkiwi/faucet,trungdtbk/faucet,wackerly/faucet,shivarammysore/faucet,isomer/faucet,faucetsdn/faucet,byllyfish/faucet,isomer/faucet,mwutzke/faucet,wackerly/faucet,trentindav/faucet,REANNZ/faucet,Bairdo/faucet,gizmoguy/faucet,Bairdo/faucet,byllyfish/faucet,mwutzke/faucet,anarkiwi/faucet,REANNZ/faucet