fix tests, write test to very address extraction
merge and fix conflicts
Merge pull request #1 from brad/stashaddr

Tests