better test
Refactoring wallet and address indexing