Fix storage, get tests passing again