stash
refactor tests