Fix unit tests
force version in composer.json
Migrate to the new BlockBundle code