remove useless syncronization, cleanup
add Storage test