Code coverage fix and add for many Magento versions