Completed Storage classes & unit tests. TODO: fix tests.