Refactored CmfBlockHelper
fixed tests