Fixes sortation of delivery and payment options in performance test data
Uses MShop_Factory instead of custom method and refactors addProduct() implementation in basket controller