Improved and tidied the shop.yml fixture file