::Storage: replace kludgy test with normal one