Fix unit tests for goto fix.
Fix unit tests for goto fix.

gizmoguy/faucet,trungdtbk/faucet,mwutzke/faucet,trentindav/faucet,shivarammysore/faucet,trungdtbk/faucet,gizmoguy/faucet,trentindav/faucet,anarkiwi/faucet,REANNZ/faucet,faucetsdn/faucet,shivarammysore/faucet,anarkiwi/faucet,REANNZ/faucet,mwutzke/faucet,faucetsdn/faucet