Minor changes to clean up and for some storage test