Merge pull request #749 from chrisglass/clean-tests-wallet