Change some of the file locations. WalletTools is not a tests
A lot of messing around with wallet and walletController