Add short timeout to all Storage tests