Merge "Use DatabaseBlock instead of deprecated Block in CompositeBlock tests"