Replace overiding of blocks with injection of dummy customer/session model. Fixes #14 Fixes #13