Tests separated (not fully fixed :-( )
Added middleware to inject current user/shop in request