Add null storage
fix those tests