Removed blocks-first declaration that was added to fix coverage padding, moved the padding to a new coverage block declaration

Review changes