5.01 (Storable) Tests added, structure changes