commented out breaking part of code and added timeout to test, we need to figure out how not to pollute localStorage
stash
merge