Renamed store_name to merchant_name
New test for tag editing