Assign correct block type.
Add/update unit tests.