Added back a test
Merge branch 'devel' of github.com:etotheipi/BitcoinArmory into devel