new block datastructure and update tests