changes for shop style unit tests

@aprato can you take a look?