Fixing up creating shops and adding flow test