Added storage and test interface file