Added new storage areas.
Added new tests.