Fix/update tests and block implementations
Merge branch 'master' of https://github.com/patrickherrmann/BumblebeeExample