Bugfix failing tests
Merge branch 'cart_hooks'