Merge "Increase code coverage for ExecuteBuildingBlockBuilder class"