Add shopid
Start work on tests