Updated block and blocktest