Fixed blocks.
Fixed test.