renamed storage utils and added a couple more tests