demo shop (cherry picked from commit c4be359)
Fixing integration test for ce and pe versions, as with the same id as in other tests something was not flushed. (cherry picked from commit 33f6822)