fix RemoteStorage and tests