fix tests for new merge
fix tests for new merge

habibmasuro/coinpunk,kyledrake/coinpunk,Bushstar/talentpunk,RaitoBezarius/coinpunk,Bushstar/featherpunk,RobertStuff/coinpunk,bitpay/coinpunk,offlinehacker/coinpunk,Tetpay/coinpunk,dayreiner/quarkpunk,Bushstar/coinpunk,Bushstar/coinpunk,RaitoBezarius/coinpunk,kyledrake/coinpunk,eXcomm/coinpunk,eXcomm/coinpunk,habibmasuro/coinpunk