Class Storage increased and test created.
Small upgrades.