(#1931) - Reduce storage request in order to pass tests