bug-fix: top-level stash retrievals work now

add tests for this