Stash test work (likely deprecated by address token resolver...
... rewrite).
Stash work on address token resolver re-write + tests.