Fixing sound bugs. adding mock storage for tests.