Fixing some tests n' things for local storage backup