Fix issue with block inheritance in template
Fix unit-tests