cleanup block getValue & getContentData
updated block tests
Merge branch 'hotfix/block-data-indexing'