Further refactoring of the BlockBuilder methods
Remove obsolete test