Fixed Test - storage + Integration