TODO for today :)
@storage is not user-accesible
Restoring some of the tests