reworking before blocks, fixes to merchant repo tests
Merge branch 'master' of github.com:objectParadigm/sales-engine