Update fixes some tests, need to clean up storage tests